diff options
| author | bors-servo <servo-ops@mozilla.com> | 2020-04-16 21:23:23 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-16 21:23:23 -0400 |
| commit | 3ca86eeba51aa326339da8794c302c48a7fc875d (patch) | |
| tree | d7459517120774eda0d5c3a916f281476a6502c7 /python/servo | |
| parent | d1f1371509d1b18d34cc91e05b1a744bdc3ff01b (diff) | |
| parent | 015805de654254afb75a4958b52cd31954c2da40 (diff) | |
| download | servo-3ca86eeba51aa326339da8794c302c48a7fc875d.tar.gz servo-3ca86eeba51aa326339da8794c302c48a7fc875d.zip | |
Auto merge of #26206 - Manishearth:vcvars, r=jdm
Add VCINSTALLDIR to the 'do not run within vcvarsall' check
Servo is able to run with VSINSTALLDIR set, but not VCINSTALLDIR, since cc-rs takes it to mean vcvarsall has been called.
As far as I can tell servo is able to build with a custom VS install without needing help finding it (aside from perhaps VSINSTALLDIR), since many tools use a non-env var method of finding VS.
r? @jdm
Diffstat (limited to 'python/servo')
| -rw-r--r-- | python/servo/build_commands.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/python/servo/build_commands.py b/python/servo/build_commands.py index 88b3e976f34..3b87e9aba7e 100644 --- a/python/servo/build_commands.py +++ b/python/servo/build_commands.py @@ -256,10 +256,11 @@ class MachCommands(CommandBase): vs_dirs = self.vs_dirs() 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" "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) vcinstalldir = vs_dirs['vcdir'] if not os.path.exists(vcinstalldir): |