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

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

Issue 951673002: Revert "Pull chromium at 2c3ffb2355a27c32f45e508ef861416b820c823b" (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: 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/nacl/BUILD.gn ('k') | build/toolchain/win/midl.gni » ('j') | 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 e9461a4644b4f5a88174cecb1216209cf04b7dcd..b8f87e7157acc39d0fc8aa453c1861fd4e2c083f 100644
--- a/build/toolchain/win/BUILD.gn
+++ b/build/toolchain/win/BUILD.gn
@@ -31,7 +31,7 @@ toolchain_data = exec_script("setup_toolchain.py",
gyp_win_tool_path,
windows_sdk_path,
visual_studio_runtime_dirs,
- current_cpu,
+ cpu_arch,
],
"scope")
@@ -43,7 +43,7 @@ if (vc_bin_dir == "") {
concurrent_links = exec_script("../get_concurrent_links.py", [], "value")
# Parameters:
-# current_cpu: current_cpu to pass as a build arg
+# cpu_arch: cpu_arch to pass as a build arg
# environment: File name of environment file.
template("msvc_toolchain") {
if (defined(invoker.concurrent_links)) {
@@ -62,7 +62,7 @@ template("msvc_toolchain") {
"copy_dlls",
rebase_path(root_build_dir),
configuration,
- invoker.current_cpu,
+ invoker.cpu_arch,
])
if (use_goma) {
@@ -200,10 +200,7 @@ 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() {
- current_cpu = invoker.current_cpu
-
- # TODO(dpranke): cpu_arch is here for backwards compatibility.
- cpu_arch = current_cpu
+ cpu_arch = invoker.cpu_arch
}
}
}
@@ -212,18 +209,16 @@ template("msvc_toolchain") {
# get it sorted out how we want to support them both in a single build.
# Right now only one of these can be enabled at a time because the
# runtime libraries get copied to root_build_dir and would collide.
-if (current_cpu == "x86") {
+if (cpu_arch == "x86") {
msvc_toolchain("32") {
environment = "environment.x86"
-
- current_cpu = "x86"
+ cpu_arch = "x86"
}
}
-if (current_cpu == "x64") {
+if (cpu_arch == "x64") {
msvc_toolchain("64") {
environment = "environment.x64"
-
- current_cpu = "x64"
+ cpu_arch = "x64"
}
}
« no previous file with comments | « build/toolchain/nacl/BUILD.gn ('k') | build/toolchain/win/midl.gni » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698