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

Unified Diff: build/toolchain/mac/BUILD.gn

Issue 2174373002: [iOS] Fix build always considered dirty. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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
« no previous file with comments | « build/config/ios/rules.gni ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/toolchain/mac/BUILD.gn
diff --git a/build/toolchain/mac/BUILD.gn b/build/toolchain/mac/BUILD.gn
index c330f6447dd986a1a0f4a1add0db34be036a71d0..5ccda9a9bc0238eba7c6f79d233f622ef76d5fe7 100644
--- a/build/toolchain/mac/BUILD.gn
+++ b/build/toolchain/mac/BUILD.gn
@@ -92,7 +92,7 @@ template("mac_toolchain") {
"TOOL_VERSION=${tool_versions.linker_driver} " +
rebase_path("//build/toolchain/mac/linker_driver.py", root_build_dir)
- if (is_ios && additional_toolchains != []) {
+ if (invoker.toolchain_os == "ios" && additional_toolchains != []) {
# For a fat build, the generation of dSYM needs to be performed after the
# generation of the fat binaries using "lipo". So disable the generation
# of the dSYM for intermediate architecture specific binaries.
@@ -114,7 +114,7 @@ template("mac_toolchain") {
# If dSYMs are enabled, this flag will be added to the link tools.
if (_enable_dsyms) {
- dsym_switch = " -Wcrl,dsym," + rebase_path(root_out_dir) + " "
+ dsym_switch = " -Wcrl,dsym,{{root_out_dir}} "
_dsym_output =
"{{root_out_dir}}/{{target_output_name}}{{output_extension}}.dSYM/"
} else {
« no previous file with comments | « build/config/ios/rules.gni ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698