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

Unified Diff: build/config/mac/base_rules.gni

Issue 2387723002: Test CL to demonstrate GN + hermetic toolchain
Patch Set: more fixes. Created 4 years, 3 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 | « no previous file | build/config/mac/compile_xib.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/config/mac/base_rules.gni
diff --git a/build/config/mac/base_rules.gni b/build/config/mac/base_rules.gni
index 4e34cb53c8021772a414dcd32123671fb422b18f..7dcac37ae4fa4655dbdf571b090e775123bcf1a5 100644
--- a/build/config/mac/base_rules.gni
+++ b/build/config/mac/base_rules.gni
@@ -155,12 +155,15 @@ template("compile_xibs") {
outputs = [
"$target_gen_dir/$target_name/{{source_name_part}}.nib",
]
- args =
- [
- "--input",
- "{{source}}",
- "--output",
- rebase_path("$target_gen_dir/$target_name/{{source_name_part}}.nib"),
- ] + ibtool_flags
+ args = [
+ "--input",
+ "{{source}}",
+ "--output",
+ rebase_path("$target_gen_dir/$target_name/{{source_name_part}}.nib"),
+ ]
+ if (!use_system_xcode) {
+ args += [ "--developer_dir", hermetic_xcode_path ]
+ }
+ args += ibtool_flags
}
}
« no previous file with comments | « no previous file | build/config/mac/compile_xib.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698