summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoshua Duong <joshuaduong@google.com>2019-02-13 11:24:48 -0800
committerJoshua Duong <joshuaduong@google.com>2019-02-13 20:23:21 +0000
commit77d317c032d88322635a68df3fd7f8c47b56f955 (patch)
tree5deda07856e434d4ac41ce4ddf134239f7cc05d4
parent0e3b8429facc1a6498f8a1013f73f381767842f2 (diff)
downloadqt-77d317c032d88322635a68df3fd7f8c47b56f955.tar.gz
PATCH (Qt 5.12.1): Build without using hermetic version of xcode.
If on a google corp machine, chromium has strict requirements on which version of xcode you can use to build chromium. Let's just try to build with whatever version we have installed and see what happens ;). Whenever updating the Qt source, please apply this patch. Change-Id: I4b5e98f242ea9bedd261fb266713231114b62367
-rwxr-xr-xqt-everywhere-src-5.12.1/qtwebengine/src/3rdparty/chromium/build/mac/should_use_hermetic_xcode.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/qt-everywhere-src-5.12.1/qtwebengine/src/3rdparty/chromium/build/mac/should_use_hermetic_xcode.py b/qt-everywhere-src-5.12.1/qtwebengine/src/3rdparty/chromium/build/mac/should_use_hermetic_xcode.py
index 124cf543d4..289a2bc3ff 100755
--- a/qt-everywhere-src-5.12.1/qtwebengine/src/3rdparty/chromium/build/mac/should_use_hermetic_xcode.py
+++ b/qt-everywhere-src-5.12.1/qtwebengine/src/3rdparty/chromium/build/mac/should_use_hermetic_xcode.py
@@ -32,7 +32,8 @@ def main():
if os.environ.get('FORCE_MAC_TOOLCHAIN') or allow_corp:
if not mac_toolchain.PlatformMeetsHermeticXcodeRequirements():
return "2"
- return "1"
+ """ See https://github.com/Homebrew/homebrew-core/issues/21809 """
+ return "0"
else:
return "0"