Skip to content

Commit 1dae478

Browse files
committed
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 <[email protected]> (cherry picked from commit 5d2026c)
1 parent ed23d9f commit 1dae478

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

src/core/config/mac_osx.pri

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@ isEmpty(QMAKE_MAC_SDK_VERSION) {
99
isEmpty(QMAKE_MAC_SDK_VERSION): error("Could not resolve SDK version for \'$${QMAKE_MAC_SDK}\'")
1010
}
1111

12+
# chromium/build/mac/find_sdk.py expects the SDK version (mac_sdk_min) in Major.Minor format.
13+
# If Patch version is provided it fails with "Exception: No Major.Minor.Patch+ SDK found"
14+
QMAKE_MAC_SDK_VERSION_MAJOR_MINOR = $$section(QMAKE_MAC_SDK_VERSION, ".", 0, 1)
15+
1216
QMAKE_CLANG_DIR = "/usr"
1317
QMAKE_CLANG_PATH = $$eval(QMAKE_MAC_SDK.macx-clang.$${QMAKE_MAC_SDK}.QMAKE_CXX)
1418
!isEmpty(QMAKE_CLANG_PATH) {
@@ -27,7 +31,7 @@ gn_args += \
2731
clang_base_path=\"$${QMAKE_CLANG_DIR}\" \
2832
clang_use_chrome_plugins=false \
2933
mac_deployment_target=\"$${QMAKE_MACOSX_DEPLOYMENT_TARGET}\" \
30-
mac_sdk_min=\"$${QMAKE_MAC_SDK_VERSION}\" \
34+
mac_sdk_min=\"$${QMAKE_MAC_SDK_VERSION_MAJOR_MINOR}\" \
3135
mac_views_browser=false \
3236
toolkit_views=false \
3337
use_external_popup_menu=false

0 commit comments

Comments
 (0)