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

Unified Diff: build/toolchain/clang.gni

Issue 132833002: Improves GN's make_global_settings (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 11 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/android/BUILD.gn ('k') | build/toolchain/goma.gni » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/toolchain/clang.gni
diff --git a/build/toolchain/clang.gni b/build/toolchain/clang.gni
index d45ea0618a752cff1ecbb52db1a2153397a82925..433ab3227d4caadc4870bf1b36dfa6a75c6b2925 100644
--- a/build/toolchain/clang.gni
+++ b/build/toolchain/clang.gni
@@ -25,11 +25,10 @@ if (is_clang) {
make_clang_dir = "third_party/llvm-build/Release+Asserts"
}
+ # This includes the array values but not the 'make_global_settings' name.
make_clang_global_settings =
- "'make_global_settings': [" +
"['CC', '$make_clang_dir/bin/clang']," +
"['CXX', '$make_clang_dir/bin/clang++']," +
"['CC.host', '\$(CC)']," +
- "['CXX.host', '\$(CXX)']," +
- "],"
+ "['CXX.host', '\$(CXX)'],"
}
« no previous file with comments | « build/toolchain/android/BUILD.gn ('k') | build/toolchain/goma.gni » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698