diff options
| author | Yngve N. Pettersen <yngve@vivaldi.com> | 2018-04-18 00:26:29 +0900 |
|---|---|---|
| committer | Qijiang Fan <fqj@google.com> | 2020-06-05 09:05:14 +0900 |
| commit | 49910147b41f43b55a938f8dd365f8bf32ccfb5b (patch) | |
| tree | 83a0d9079868587e86b66aa0efa7b05ea721bdc7 /build | |
| parent | ac0787978d18f974a845ae3e8f287110605ee044 (diff) | |
| download | libchrome-49910147b41f43b55a938f8dd365f8bf32ccfb5b.tar.gz | |
GN: Fix bootstrap call to setup_toolchain
The parameters to setup_toolchain changed, adding an OS parameter and a
filename for the environment file.
Additional fixes:
- Add missing base file to list of files
- vs_toolchain should output Windows paths properly escaped
Change-Id: I0e05bf34c8b603f16b901e76164e480121ed9d14
Reviewed-on: https://chromium-review.googlesource.com/1013926
Reviewed-by: Dirk Pranke <dpranke@chromium.org>
Commit-Queue: Yngve Pettersen <yngve@vivaldi.com>
Cr-Commit-Position: refs/heads/master@{#551341}
CrOS-Libchrome-Original-Commit: 95fe44b3c31cf5e1a668d9ef8853aaf2cf9523a5
Diffstat (limited to 'build')
| -rwxr-xr-x | build/vs_toolchain.py | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/build/vs_toolchain.py b/build/vs_toolchain.py index 6060415bda..11e5e4c7d3 100755 --- a/build/vs_toolchain.py +++ b/build/vs_toolchain.py @@ -13,6 +13,7 @@ import shutil import stat import subprocess import sys +from gn_helpers import ToGNString script_dir = os.path.dirname(os.path.realpath(__file__)) @@ -448,17 +449,17 @@ def GetToolchainDir(): runtime_dll_dirs = SetEnvironmentAndGetRuntimeDllDirs() win_sdk_dir = SetEnvironmentAndGetSDKDir() - print '''vs_path = "%s" -sdk_path = "%s" -vs_version = "%s" -wdk_dir = "%s" -runtime_dirs = "%s" + print '''vs_path = %s +sdk_path = %s +vs_version = %s +wdk_dir = %s +runtime_dirs = %s ''' % ( - NormalizePath(os.environ['GYP_MSVS_OVERRIDE_PATH']), - win_sdk_dir, - GetVisualStudioVersion(), - NormalizePath(os.environ.get('WDK_DIR', '')), - os.path.pathsep.join(runtime_dll_dirs or ['None'])) + ToGNString(NormalizePath(os.environ['GYP_MSVS_OVERRIDE_PATH'])), + ToGNString(win_sdk_dir), + ToGNString(GetVisualStudioVersion()), + ToGNString(NormalizePath(os.environ.get('WDK_DIR', ''))), + ToGNString(os.path.pathsep.join(runtime_dll_dirs or ['None']))) def main(): |