admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Disable hermetic toolchain when building on macOS 10.14.

Browse Source 
This is copied from https://chromium-review.googlesource.com/1333877
More info is available at crbug.com/904400.

Bug: webrtc:10093
Change-Id: Ia256b3515b354b501663f0536c2735542474d3c0
Reviewed-on: https://webrtc-review.googlesource.com/c/113422
Reviewed-by: Oleh Prypin <oprypin@webrtc.org>
Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#25932}
This commit is contained in:
Mirko Bonadei 2018-12-06 11:51:39 +01:00 committed by Commit Bot
parent 3f10ca8145
commit 10b051083c
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
build_overrides/build.gni
View File

@ -41,8 +41,12 @@ if (host_os == "mac") {
_result = exec_script("//build/mac/should_use_hermetic_xcode.py", _result = exec_script("//build/mac/should_use_hermetic_xcode.py",
[ target_os ], [ target_os ],
"value") "value")
assert(_result != 2,
"Do not allow building targets with the default " + # TODO(crbug.com/904400): Re-enable this once the hermetic toolchain runs on
"hermetic toolchain if the minimum OS version is not met.") # latest macOS release [Mojave].
use_system_xcode = _result == 0 # assert(_result != 2,
# "Do not allow building targets with the default " +
# "hermetic toolchain if the minimum OS version is not met.")
# use_system_xcode = _result == 0
use_system_xcode = _result != 1 # Remove when crbug.com/904400 is fixed.
} }