summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--DEPS2
-rw-r--r--build_overrides/build.gni18
2 files changed, 19 insertions, 1 deletions
diff --git a/DEPS b/DEPS
index 79bd3222d3..8798263c45 100644
--- a/DEPS
+++ b/DEPS
@@ -5,7 +5,7 @@ vars = {
'pdfium_git': 'https://pdfium.googlesource.com',
'android_ndk_revision': '26d93ec07f3ce2ec2cdfeae1b21ee6f12ff868d8',
- 'build_revision': 'dc8cb2c8bcc36f5b648fdd3846eafce7844ed762',
+ 'build_revision': 'acf607f7d345915ea2ecca208bc516677d298463',
'buildtools_revision': '5fd66957f08bb752dca714a591c84587c9d70762',
'catapult_revision': '327256cb1c387e62a2c7e6960e2398867665fb51',
'clang_revision': 'd6ee675e0afc5fcb2d4b814c6e5854832178623b',
diff --git a/build_overrides/build.gni b/build_overrides/build.gni
index a9e8000a85..61d7814005 100644
--- a/build_overrides/build.gni
+++ b/build_overrides/build.gni
@@ -40,4 +40,22 @@ declare_args() {
# due to 4GiB file size limit, see https://crbug.com/648948.
# Set this flag to true to skip the assertion.
ignore_elf32_limitations = false
+
+ # Use the system install of Xcode for tools like ibtool, libtool, etc.
+ # This does not affect the compiler. When this variable is false, targets will
+ # 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 = ""
+}
+
+if (use_system_xcode == "") {
+ if (target_os == "mac") {
+ _result =
+ exec_script("//build/mac/should_use_hermetic_xcode.py", [], "value")
+ use_system_xcode = _result == 0
+ }
+ if (target_os == "ios") {
+ use_system_xcode = true
+ }
}