From 015805de654254afb75a4958b52cd31954c2da40 Mon Sep 17 00:00:00 2001 From: Manish Goregaokar Date: Thu, 16 Apr 2020 14:43:03 -0700 Subject: Add VCINSTALLDIR to the 'do not run within vcvarsall' check --- python/servo/build_commands.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'python/servo/build_commands.py') 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): -- cgit v1.2.3