diff options
| author | Manish Goregaokar <manishsmail@gmail.com> | 2020-04-16 14:43:03 -0700 |
|---|---|---|
| committer | Manish Goregaokar <manishsmail@gmail.com> | 2020-04-16 14:51:34 -0700 |
| commit | 015805de654254afb75a4958b52cd31954c2da40 (patch) | |
| tree | ec1a4e09e7718018ec8ce56a32ec13a44f894021 | |
| parent | 28299459634c5cfccce28f57f148fc31e56c1b42 (diff) | |
| download | servo-015805de654254afb75a4958b52cd31954c2da40.tar.gz servo-015805de654254afb75a4958b52cd31954c2da40.zip | |
Add VCINSTALLDIR to the 'do not run within vcvarsall' check
| -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): |