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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: build/toolchain/nacl_toolchain.gni

Issue 1943583002: GN: forward_variables_from shouldn't clobber vars. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 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
« build/toolchain/gcc_toolchain.gni ('K') | « build/toolchain/gcc_toolchain.gni ('k') | components/cronet/android/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/toolchain/nacl_toolchain.gni
diff --git a/build/toolchain/nacl_toolchain.gni b/build/toolchain/nacl_toolchain.gni
index 159366647a1d217dd9d75a6988c2948ed37a6920..96722cb3d057b754199da63db368680fcd4ec945 100644
--- a/build/toolchain/nacl_toolchain.gni
+++ b/build/toolchain/nacl_toolchain.gni
@@ -38,8 +38,6 @@ template("nacl_toolchain") {
"cc",
"cxx",
"deps",
- "is_clang",
- "is_nacl_glibc",
"ld",
"link_outputs",
"nm",
@@ -49,6 +47,13 @@ template("nacl_toolchain") {
"toolchain_cpu",
])
+ if (defined(invoker.is_clang)) {
+ is_clang = invoker.is_clang
+ }
+ if (defined(invoker.is_nacl_glibc)) {
+ is_nacl_glibc = invoker.is_nacl_glibc
+ }
+
# We do not support component builds or sanitizers with the NaCl toolchains.
is_component_build = false
clear_sanitizers = true
« build/toolchain/gcc_toolchain.gni ('K') | « build/toolchain/gcc_toolchain.gni ('k') | components/cronet/android/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698