feat(msvs): add support for CL env var

nodejs · Nov 3, 2021 · 30794de · 30794de
1 parent 33ff306
commit 30794de
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/pylib/gyp/generator/msvs.py b/pylib/gyp/generator/msvs.py
@@ -3466,6 +3466,8 @@ def _GetValueFormattedForMSBuild(tool_name, name, value):
         formatted_value = char.join(
             [MSVSSettings.ConvertVCMacrosToMSBuild(i) for i in value]
         )
+        if tool_name == "ClCompile" and name == "AdditionalOptions":
+            formatted_value += os.environ.get("CL", "").replace("#", "=")
     else:
         formatted_value = MSVSSettings.ConvertVCMacrosToMSBuild(value)
     return formatted_value

diff --git a/pylib/gyp/msvs_emulation.py b/pylib/gyp/msvs_emulation.py
@@ -1125,6 +1125,7 @@ def _ExtractImportantEnvironment(output_of_set):
         "systemroot",
         "temp",
         "tmp",
+        "cl",
     )
     env = {}
     # This occasionally happens and leads to misleading SYSTEMROOT error messages
-Original file line number
+Diff line change
@@ Expand Up / @@ -1125,6 +1125,7 @@ def _ExtractImportantEnvironment(output_of_set): @@
             "systemroot",
             "temp",
             "tmp",
+            "cl",
         )
         env = {}
         # This occasionally happens and leads to misleading SYSTEMROOT error messages
@@ Expand Down @@