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 |