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

Unified Diff: build/toolchain/win/BUILD.gn

Issue 936103003: Roll GN binaries to #317120 for the cpu_arch changes (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@gn_cpu_arch_changes
Patch Set: fix android_gcc_toolchain() invocations for new toolchains Created 5 years, 10 months 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 | « build/toolchain/mac/BUILD.gn ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/toolchain/win/BUILD.gn
diff --git a/build/toolchain/win/BUILD.gn b/build/toolchain/win/BUILD.gn
index b8f87e7157acc39d0fc8aa453c1861fd4e2c083f..099d91abdf12ff1f9b6e25b73b3edd62ba324d96 100644
--- a/build/toolchain/win/BUILD.gn
+++ b/build/toolchain/win/BUILD.gn
@@ -200,7 +200,10 @@ template("msvc_toolchain") {
# 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 = invoker.cpu_arch
+ current_cpu = invoker.current_cpu
+
+ # TODO(dpranke): cpu_arch is here for backwards compatibility.
+ cpu_arch = current_cpu
}
}
}
@@ -212,13 +215,15 @@ template("msvc_toolchain") {
if (cpu_arch == "x86") {
msvc_toolchain("32") {
environment = "environment.x86"
- cpu_arch = "x86"
+
+ current_cpu = "x86"
}
}
if (cpu_arch == "x64") {
msvc_toolchain("64") {
environment = "environment.x64"
- cpu_arch = "x64"
+
+ current_cpu = "x64"
}
}
« no previous file with comments | « build/toolchain/mac/BUILD.gn ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698