From ac81cbcdf101027db900390cba38c3e896ebd4cf Mon Sep 17 00:00:00 2001 From: Marshall Greenblatt Date: Tue, 9 Dec 2014 12:48:17 +0000 Subject: [PATCH] Windows: Use the amd64_x86 cross-compiler with custom builds (issue #1470). git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@1954 5089003a-bbd8-11dd-ad1f-f1f9622dbc98 --- patch/patches/build.patch | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/patch/patches/build.patch b/patch/patches/build.patch index f2612055e..625626b8a 100644 --- a/patch/patches/build.patch +++ b/patch/patches/build.patch @@ -36,7 +36,7 @@ index c9cf226..0dedbe3 100755 archs = [] diff --git toolchain/win/setup_toolchain.py toolchain/win/setup_toolchain.py -index 5e292ab..70ad093 100644 +index 5e292ab..92ea3f4 100644 --- toolchain/win/setup_toolchain.py +++ toolchain/win/setup_toolchain.py @@ -25,6 +25,8 @@ def ExtractImportantEnvironment(): @@ -48,3 +48,12 @@ index 5e292ab..70ad093 100644 'path', 'pathext', 'systemroot', +@@ -90,7 +92,7 @@ important_env_vars = ExtractImportantEnvironment() + path = important_env_vars["PATH"].split(";") + + # Add 32-bit compiler path to the beginning and write the block. +-path32 = [os.path.join(vs_path, "VC\\BIN")] + \ ++path32 = [os.path.join(vs_path, "VC\\BIN\\amd64_x86")] + \ + [os.path.join(win_sdk_path, "bin\\x86")] + \ + path + important_env_vars["PATH"] = ";".join(path32)