Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(143)

Unified Diff: build/config/BUILDCONFIG.gn

Issue 722723004: Rework win_toolchains a bit and copy the vs runtime DLLs as needed. (Closed) Base URL: http://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase onto #304284 Created 6 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | build/toolchain/win/BUILD.gn » ('j') | build/vs_toolchain.py » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/config/BUILDCONFIG.gn
diff --git a/build/config/BUILDCONFIG.gn b/build/config/BUILDCONFIG.gn
index c9ec4a2f858aa7bbdbebcd01cee2e842c504c228..0d65c44da6405e085e737fc6ad50a1f47a13fdbb 100644
--- a/build/config/BUILDCONFIG.gn
+++ b/build/config/BUILDCONFIG.gn
@@ -34,15 +34,6 @@ declare_args() {
# to configure warnings.
is_clang = (os == "mac" || os == "ios" || os == "linux" || os == "chromeos")
- # Forces a 64-bit build on Windows. Does nothing on other platforms. Normally
- # we build 32-bit on Windows regardless of the current host OS bit depth.
- # Setting this flag will override this logic and generate 64-bit toolchains.
- #
- # Normally this would get set automatically when you specify a target using
- # the 64-bit toolchain. You can also set this on the command line to convert
- # the default toolchain to 64-bit.
- force_win64 = false
-
# Selects the desired build flavor. Official builds get additional
# processing to prepare for release. Normally you will want to develop and
# test with this flag off.
@@ -174,16 +165,6 @@ is_desktop_linux = is_linux && !is_chromeos
# CPU ARCHITECTURE
# =============================================================================
-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 = "x64"
- } else {
- cpu_arch = "x86"
- }
-}
-
if (is_android) {
# TODO(cjhopman): enable this assert once bots are updated to not set
# cpu_arch.
@@ -495,19 +476,14 @@ set_defaults("test") {
# default toolchain.
if (is_win) {
- # TODO(brettw) name the toolchains the same as cpu_arch as with Linux below
- # to eliminate these conditionals.
- if (build_cpu_arch == "x64") {
- host_toolchain = "//build/toolchain/win:64"
- } else if (build_cpu_arch == "x86") {
- host_toolchain = "//build/toolchain/win:32"
- }
-
+ # On windows we use the same toolchain for host and target by default.
+ # TODO(dpranke): rename the toolchains to x64 and x86 to match cpu_arch.
if (cpu_arch == "x64") {
- set_default_toolchain("//build/toolchain/win:64")
+ host_toolchain = "//build/toolchain/win:64"
} else if (cpu_arch == "x86") {
- set_default_toolchain("//build/toolchain/win:32")
+ host_toolchain = "//build/toolchain/win:32"
}
+ set_default_toolchain("$host_toolchain")
} else if (is_android) {
# Use clang for the x86/64 Linux host builds.
if (build_cpu_arch == "x86" || build_cpu_arch == "x64") {
« no previous file with comments | « no previous file | build/toolchain/win/BUILD.gn » ('j') | build/vs_toolchain.py » ('J')

Powered by Google App Engine
This is Rietveld 408576698