From dafbe57ab67cdceec5258b77d5cbffb4700c6185 Mon Sep 17 00:00:00 2001 From: "Yngve N. Pettersen" Date: Tue, 17 Apr 2018 15:26:29 +0000 Subject: [PATCH] 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 Commit-Queue: Yngve Pettersen Cr-Original-Commit-Position: refs/heads/master@{#551341} Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src Cr-Mirrored-Commit: 95fe44b3c31cf5e1a668d9ef8853aaf2cf9523a5 --- vs_toolchain.py | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/vs_toolchain.py b/vs_toolchain.py index 6060415bd..11e5e4c7d 100755 --- a/vs_toolchain.py +++ b/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():