diff options
| author | Peter Varga <pvarga@inf.u-szeged.hu> | 2020-04-07 10:09:37 +0200 |
|---|---|---|
| committer | Peter Varga <pvarga@inf.u-szeged.hu> | 2020-04-26 22:09:07 +0200 |
| commit | 1dae478232ac22a92637d919287fbbf11c32b7c7 (patch) | |
| tree | 8a483de3700522e4aae901534a99fc9ef8da72b1 | |
| parent | ed23d9f54b2c8735a6d4e8f4f171a5cd6700dd90 (diff) | |
Fix macOS build after 10.15.4
QMAKE_MAC_SDK_VERSION is set by
/usr/bin/xcrun --sdk macosx --show-sdk-version
in qtbase/mkpecs/features/mac/sdk.prf
From 10.15.4, xcrun outputs the SDK version in Major.Minor.Patch format
instead of Major.Minor. mac_sdk_min gn arg is expected to be in
Major.Minor format, therefor pass only the first 2 revision numbers to
gn.
Fixes: QTBUG-83318
Change-Id: I3af523dd5df8149fb5cd57b259c2bed889db88b5
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
(cherry picked from commit 5d2026cb04ef8fd408e5722a84e2affb5b9a3119)
| -rw-r--r-- | src/core/config/mac_osx.pri | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/core/config/mac_osx.pri b/src/core/config/mac_osx.pri index 4426901cf..7b77a8bf7 100644 --- a/src/core/config/mac_osx.pri +++ b/src/core/config/mac_osx.pri @@ -9,6 +9,10 @@ isEmpty(QMAKE_MAC_SDK_VERSION) { isEmpty(QMAKE_MAC_SDK_VERSION): error("Could not resolve SDK version for \'$${QMAKE_MAC_SDK}\'") } +# chromium/build/mac/find_sdk.py expects the SDK version (mac_sdk_min) in Major.Minor format. +# If Patch version is provided it fails with "Exception: No Major.Minor.Patch+ SDK found" +QMAKE_MAC_SDK_VERSION_MAJOR_MINOR = $$section(QMAKE_MAC_SDK_VERSION, ".", 0, 1) + QMAKE_CLANG_DIR = "/usr" QMAKE_CLANG_PATH = $$eval(QMAKE_MAC_SDK.macx-clang.$${QMAKE_MAC_SDK}.QMAKE_CXX) !isEmpty(QMAKE_CLANG_PATH) { @@ -27,7 +31,7 @@ gn_args += \ clang_base_path=\"$${QMAKE_CLANG_DIR}\" \ clang_use_chrome_plugins=false \ mac_deployment_target=\"$${QMAKE_MACOSX_DEPLOYMENT_TARGET}\" \ - mac_sdk_min=\"$${QMAKE_MAC_SDK_VERSION}\" \ + mac_sdk_min=\"$${QMAKE_MAC_SDK_VERSION_MAJOR_MINOR}\" \ mac_views_browser=false \ toolkit_views=false \ use_external_popup_menu=false |