diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-22 22:38:39 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-22 22:38:39 +0000 |
| commit | 777ad7fd876f6a3903a7c8b625568fc66413d0ef (patch) | |
| tree | d530c6958da118eab020d83c8d64a37e3807a8b0 /build/config | |
| parent | 06e924a119c089367cdb12d86bca3c00119f939c (diff) | |
| download | chromium_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/config')
| -rw-r--r-- | build/config/BUILDCONFIG.gn | 8 | ||||
| -rw-r--r-- | build/config/compiler/BUILD.gn | 2 | ||||
| -rw-r--r-- | build/config/win/BUILD.gn | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/build/config/BUILDCONFIG.gn b/build/config/BUILDCONFIG.gn index d3a0683..f67106b 100644 --- a/build/config/BUILDCONFIG.gn +++ b/build/config/BUILDCONFIG.gn @@ -150,9 +150,9 @@ if (is_win) { # Always use 32-bit on Windows, even when compiling on a 64-bit host OS, # unless the override flag is specified. if (force_win64) { - cpu_arch = "ia64" + cpu_arch = "x64" } else { - cpu_arch = "ia32" + cpu_arch = "x86" } } @@ -383,9 +383,9 @@ set_defaults("source_set") { # default toolchain. if (is_win) { - if (cpu_arch == "ia64") { + if (cpu_arch == "x64") { host_toolchain = "//build/toolchain/win:64" - } else if (cpu_arch == "ia32") { + } else if (cpu_arch == "x86") { host_toolchain = "//build/toolchain/win:32" } set_default_toolchain(host_toolchain) diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn index 20ffbb5..6f69e05 100644 --- a/build/config/compiler/BUILD.gn +++ b/build/config/compiler/BUILD.gn @@ -83,7 +83,7 @@ config("compiler") { # Use gold for linking on 64-bit Linux only (on 32-bit it runs out of # address space, and it doesn't support cross-compiling). - if (cpu_arch == "ia64") { + if (cpu_arch == "x64") { gold_path = rebase_path("//third_party/gold", ".", root_build_dir) ldflags += [ "-B$gold_path", diff --git a/build/config/win/BUILD.gn b/build/config/win/BUILD.gn index 72147e0..8bedbf5 100644 --- a/build/config/win/BUILD.gn +++ b/build/config/win/BUILD.gn @@ -44,7 +44,7 @@ config("sdk") { # Linker flags for Windows SDK setup, this is applied only to EXEs and DLLs. config("sdk_link") { - if (cpu_arch == "ia64") { + if (cpu_arch == "x64") { ldflags = [ "/MACHINE:X64" ] lib_dirs = [ "$windows_sdk_path\Lib\win8\um\x64", |