summaryrefslogtreecommitdiffstats
path: root/build/toolchain
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-11-22 22:38:39 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-11-22 22:38:39 +0000
commit777ad7fd876f6a3903a7c8b625568fc66413d0ef (patch)
treed530c6958da118eab020d83c8d64a37e3807a8b0 /build/toolchain
parent06e924a119c089367cdb12d86bca3c00119f939c (diff)
downloadchromium_src-777ad7fd876f6a3903a7c8b625568fc66413d0ef.zip
chromium_src-777ad7fd876f6a3903a7c8b625568fc66413d0ef.tar.gz
chromium_src-777ad7fd876f6a3903a7c8b625568fc66413d0ef.tar.bz2
Add support for 32-bit and 64-bit Windows compiles in GN.
Rename ia32 and ia64 to x86 and x64 BUG=297677, 322109 R=scottmg@chromium.org Review URL: https://codereview.chromium.org/83733005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@236851 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/toolchain')
-rw-r--r--build/toolchain/win/BUILD.gn2
1 files changed, 1 insertions, 1 deletions
diff --git a/build/toolchain/win/BUILD.gn b/build/toolchain/win/BUILD.gn
index 68194ab..6abf808 100644
--- a/build/toolchain/win/BUILD.gn
+++ b/build/toolchain/win/BUILD.gn
@@ -146,7 +146,7 @@ toolchain("64") {
# When invoking this toolchain not as the default one, these args will be
# passed to the build. They are ignored when this is the default toolchain.
toolchain_args() {
- cpu_arch = "ia64"
+ cpu_arch = "x64"
# Normally the build config resets the CPU architecture to 32-bits. Setting
# this flag overrides that behavior.
force_win64 = true