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

Unified Diff: tools/gn/gyp_target_writer.cc

Issue 46683002: GN Mac build work (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 2 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: tools/gn/gyp_target_writer.cc
diff --git a/tools/gn/gyp_target_writer.cc b/tools/gn/gyp_target_writer.cc
index 5f350545dcfef13a0156cbdf08c44caec94dfe85..18063e8c032740621e57659f49030896e0e44aaf 100644
--- a/tools/gn/gyp_target_writer.cc
+++ b/tools/gn/gyp_target_writer.cc
@@ -37,6 +37,19 @@ void GypTargetWriter::WriteFile(const SourceFile& gyp_file,
file << "# Generated by GN. Do not edit.\n\n";
file << "{\n";
file << " 'skip_includes': 1,\n";
+
+ if (targets[0].debug->settings()->IsMac()) {
+ // Global settings for make. This must match common.gypi :(
Nico 2013/10/28 23:05:14 Oh, here it is. Maybe add a comment to that other
+ file << " 'make_global_settings': [\n";
+ file << " ['CC', 'third_party/llvm-build/Release+Asserts/bin/clang'],\n";
+ file <<
+ " ['CXX', 'third_party/llvm-build/Release+Asserts/bin/clang++'],\n";
+ file << " ['CC.host', '$(CC)'],\n";
+ file << " ['CXX.host', '$(CXX)'],\n";
+ file << " ],\n";
+ }
+ // TODO(brettw) android.
+
file << " 'targets': [\n";
for (size_t i = 0; i < targets.size(); i++) {

Powered by Google App Engine
This is Rietveld 408576698