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

Unified Diff: build/toolchain/toolchain.gni

Issue 2431523002: Use the hermetic toolchain if FORCE_MAC_TOOLCHAIN is set. (Closed)
Patch Set: make sure that use_system_xcode gets a default value on ios as well. Created 4 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/toolchain/toolchain.gni
diff --git a/build/toolchain/toolchain.gni b/build/toolchain/toolchain.gni
index 678b91ac84ff75045bd768ceed0b47885d9b7064..ca4bc2a7790e67dec020285ce78ede46f02bbdeb 100644
--- a/build/toolchain/toolchain.gni
+++ b/build/toolchain/toolchain.gni
@@ -46,7 +46,12 @@ declare_args() {
# instead use a hermetic install of Xcode. [The hermetic install can be
# obtained with gclient sync after setting the environment variable
# FORCE_MAC_TOOLCHAIN].
- use_system_xcode = true
+ use_system_xcode = ""
+}
+
+if ((is_mac || is_ios) && use_system_xcode == "") {
+ _result = getenv("FORCE_MAC_TOOLCHAIN")
+ use_system_xcode = _result == ""
}
# The path to the hermetic install of Xcode. Only relevant when
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698