Index: build/config/BUILDCONFIG.gn |
diff --git a/build/config/BUILDCONFIG.gn b/build/config/BUILDCONFIG.gn |
index c9ec4a2f858aa7bbdbebcd01cee2e842c504c228..b01efea66e91026586f749b3c043ed0d9480b8a6 100644 |
--- a/build/config/BUILDCONFIG.gn |
+++ b/build/config/BUILDCONFIG.gn |
@@ -41,6 +41,7 @@ declare_args() { |
# 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. |
+ # TODO(dpranke): Rework this. |
force_win64 = false |
# Selects the desired build flavor. Official builds get additional |
@@ -175,6 +176,8 @@ is_desktop_linux = is_linux && !is_chromeos |
# ============================================================================= |
if (is_win) { |
+ # TODO(dpranke): Delete this? x64 should mean x64 and force_win64 should |
scottmg
2014/11/13 03:49:59
I agree, we should get rid of force_win64, or at l
Dirk Pranke
2014/11/13 05:49:36
Yeah, I'm waiting for Brett's feedback, because I'
brettw
2014/11/14 20:45:45
Let's just delete all force_win64 stuff (including
Dirk Pranke
2014/11/14 23:03:22
Done.
|
+ # not be needed. |
# Always use 32-bit on Windows, even when compiling on a 64-bit host OS, |
# unless the override flag is specified. |
if (force_win64) { |
@@ -497,9 +500,10 @@ set_defaults("test") { |
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") { |
+ # TODO(dpranke): Fix this. |
brettw
2014/11/14 20:45:45
I'd say we should delete my comment and your todo
Dirk Pranke
2014/11/14 23:03:21
Done.
|
+ if (cpu_arch == "x64") { |
scottmg
2014/11/13 03:49:59
what's build_cpu_arch supposed to mean? the target
Dirk Pranke
2014/11/13 05:49:36
cpu_arch is the architecture you're trying to buil
|
host_toolchain = "//build/toolchain/win:64" |
- } else if (build_cpu_arch == "x86") { |
+ } else if (cpu_arch == "x86") { |
host_toolchain = "//build/toolchain/win:32" |
} |