| Index: build/toolchain/win/setup_toolchain.py
|
| diff --git a/build/toolchain/win/setup_toolchain.py b/build/toolchain/win/setup_toolchain.py
|
| index fbc201ec1abd3109d981df8446851abaf3d548f3..43a7e09adf3b3988198570dfdad4285fa0b791f4 100644
|
| --- a/build/toolchain/win/setup_toolchain.py
|
| +++ b/build/toolchain/win/setup_toolchain.py
|
| @@ -127,8 +127,13 @@ def _LoadToolchainEnv(cpu, sdk_dir):
|
| os.environ['GYP_MSVS_OVERRIDE_PATH'],
|
| 'VC/vcvarsall.bat'))
|
| if not os.path.exists(script_path):
|
| - raise Exception('%s is missing - make sure VC++ tools are installed.' %
|
| - script_path)
|
| + other_path = os.path.normpath(os.path.join(
|
| + os.environ['GYP_MSVS_OVERRIDE_PATH'],
|
| + 'VC/Auxiliary/Build/vcvarsall.bat'))
|
| + if not os.path.exists(other_path):
|
| + raise Exception('%s is missing - make sure VC++ tools are installed.' %
|
| + script_path)
|
| + script_path = other_path
|
| args = [script_path, 'amd64_x86' if cpu == 'x86' else 'amd64']
|
| variables = _LoadEnvFromBat(args)
|
| return _ExtractImportantEnvironment(variables)
|
|
|