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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 952893003: Update from https://crrev.com/317530 (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Fix gn for nacl Created 5 years, 10 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/linux/BUILD.gn ('k') | build/toolchain/nacl/BUILD.gn » ('j') | 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 056071491043e12951c9899d142f0a661f5d2778..18ee8b8cd9bd68d9e0c05e424f88dd75a50a529b 100644
--- a/build/toolchain/mac/BUILD.gn
+++ b/build/toolchain/mac/BUILD.gn
@@ -194,14 +194,17 @@ template("mac_clang_toolchain") {
}
toolchain_args() {
- os = invoker.toolchain_os
+ current_os = invoker.toolchain_os
+
+ # TODO(dpranke): os is here for backwards compatibility.
+ os = current_os
}
}
}
# Toolchain representing the target build (either mac or iOS).
mac_clang_toolchain("clang") {
- toolchain_os = os
+ toolchain_os = current_os
}
# This toolchain provides a way for iOS target compiles to reference targets
« no previous file with comments | « build/toolchain/linux/BUILD.gn ('k') | build/toolchain/nacl/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698