feat(msvs): add support for CL env var

mscdex · mscdex · commit 30794de4b9c4 · 2021-11-03T02:21:13.000-04:00
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 number	Diff line change
`@@ -3466,6 +3466,8 @@ def _GetValueFormattedForMSBuild(tool_name, name, value):`
`3466`	`3466`	`formatted_value = char.join(`
`3467`	`3467`	`[MSVSSettings.ConvertVCMacrosToMSBuild(i) for i in value]`
`3468`	`3468`	`)`
	`3469`	`+ if tool_name == "ClCompile" and name == "AdditionalOptions":`
	`3470`	`+ formatted_value += os.environ.get("CL", "").replace("#", "=")`
`3469`	`3471`	`else:`
`3470`	`3472`	`formatted_value = MSVSSettings.ConvertVCMacrosToMSBuild(value)`
`3471`	`3473`	`return formatted_value`
Original file line number	Diff line number	Diff line change
`@@ -1125,6 +1125,7 @@ def _ExtractImportantEnvironment(output_of_set):`
`1125`	`1125`	`"systemroot",`
`1126`	`1126`	`"temp",`
`1127`	`1127`	`"tmp",`
	`1128`	`+ "cl",`
`1128`	`1129`	`)`
`1129`	`1130`	`env = {}`
`1130`	`1131`	`# This occasionally happens and leads to misleading SYSTEMROOT error messages`