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

Unified Diff: build/toolchain/gcc_toolchain.gni

Issue 2116183002: Land chromium-side work to clean up handling of v8_target_cpu in the GN build. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: for review Created 4 years, 5 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
Index: build/toolchain/gcc_toolchain.gni
diff --git a/build/toolchain/gcc_toolchain.gni b/build/toolchain/gcc_toolchain.gni
index 3fe003496f4f4f5628eafe21661f378b6e1fb055..7ad4306830edf622208556aee0e0053c84962a7a 100644
--- a/build/toolchain/gcc_toolchain.gni
+++ b/build/toolchain/gcc_toolchain.gni
@@ -99,6 +99,9 @@ import("//build/toolchain/concurrent_links.gni")
# - use_gold
# Override the global use_gold setting, useful if the particular
# toolchain has a custom link step that is not actually using Gold.
+# - v8_toolchain_cpu
+# If defined, set v8_current_cpu to this, else set v8_current_cpu
+# to current_cpu.
template("gcc_toolchain") {
toolchain(target_name) {
assert(defined(invoker.ar), "gcc_toolchain() must specify a \"ar\" value")
@@ -465,6 +468,11 @@ template("gcc_toolchain") {
if (defined(invoker.use_sysroot)) {
use_sysroot = invoker.use_sysroot
}
+ if (defined(invoker.v8_toolchain_cpu)) {
+ v8_current_cpu = invoker.v8_toolchain_cpu
+ } else {
+ v8_current_cpu = current_cpu
+ }
# Disable sanitizers for non-default toolchains.
is_asan = false
@@ -523,10 +531,11 @@ template("clang_toolchain") {
forward_variables_from(invoker,
[
+ "strip",
"toolchain_cpu",
"toolchain_os",
"use_gold",
- "strip",
+ "v8_toolchain_cpu",
])
if (defined(invoker.use_debug_fission)) {

Powered by Google App Engine
This is Rietveld 408576698