Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-29 03:23:41 +01:00
Code Issues Projects Releases Packages Wiki Activity

Add VCINSTALLDIR to the 'do not run within vcvarsall' check

Browse source
This commit is contained in:
Manish Goregaokar 2020-04-16 14:43:03 -07:00
parent 2829945963
commit 015805de65
1 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
python/servo/build_commands.py
View file

@ -256,10 +256,11 @@ class MachCommands(CommandBase):
vs_dirs = self.vs_dirs() vs_dirs = self.vs_dirs()
if host != target_triple and 'windows' in target_triple: if host != target_triple and 'windows' in target_triple:
if os.environ.get('VisualStudioVersion'): if os.environ.get('VisualStudioVersion') or os.environ.get('VCINSTALLDIR'):
print("Can't cross-compile for Windows inside of a Visual Studio shell.\n" print("Can't cross-compile for Windows inside of a Visual Studio shell.\n"
"Please run `python mach build [arguments]` to bypass automatic " "Please run `python mach build [arguments]` to bypass automatic "
"Visual Studio shell.") "Visual Studio shell, and make sure the VisualStudioVersion and "
"VCINSTALLDIR environment variables are not set.")
sys.exit(1) sys.exit(1)
vcinstalldir = vs_dirs['vcdir'] vcinstalldir = vs_dirs['vcdir']
if not os.path.exists(vcinstalldir): if not os.path.exists(vcinstalldir):