Update environment for MSVC + Ninja

ruslo · ruslo · commit 172d8689a76c · 2016-01-27T22:38:30.000+07:00
diff --git a/bin/build.py b/bin/build.py
@@ -184,7 +184,8 @@ def PositiveInt(string):
   detail.verify_msys_path.verify(msys_path)
   os.environ['PATH'] = "{};{}".format(msys_path, os.getenv('PATH'))
 
-if toolchain_entry.is_nmake:
+vs_ninja = toolchain_entry.is_ninja and toolchain_entry.vs_version
+if toolchain_entry.is_nmake or vs_ninja:
   os.environ = detail.get_nmake_environment.get(
       toolchain_entry.arch, toolchain_entry.vs_version
   )

Original file line number	Diff line number	Diff line change
`@@ -184,7 +184,8 @@ def PositiveInt(string):`
`184`	`184`	`detail.verify_msys_path.verify(msys_path)`
`185`	`185`	`os.environ['PATH'] = "{};{}".format(msys_path, os.getenv('PATH'))`
`186`	`186`
`187`		`-if toolchain_entry.is_nmake:`
	`187`	`+vs_ninja = toolchain_entry.is_ninja and toolchain_entry.vs_version`
	`188`	`+if toolchain_entry.is_nmake or vs_ninja:`
`188`	`189`	`os.environ = detail.get_nmake_environment.get(`
`189`	`190`	`toolchain_entry.arch, toolchain_entry.vs_version`
`190`	`191`	`)`