diff options
| author | fanquake <fanquake@gmail.com> | 2021-01-05 16:12:39 +0800 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2021-03-10 12:57:26 +0800 |
| commit | fa5e97e8c2cf93b7afc0d6b0c460700ec18d18f2 (patch) | |
| tree | 779b0af02fd70ff5eee37f078ddb15758e5e0098 /depends/patches/qt/no_sdk_version_check.patch | |
| parent | 1be8e0f2388e243d310fe7eeb46149a690de4ddf (diff) | |
build: disable qt SDK version checking
This tries to invoke xcrun, which is not available when cross-compiling.
Given we are in control of the SDK versions being used, removing this
check has minimal-no effect.
Diffstat (limited to 'depends/patches/qt/no_sdk_version_check.patch')
| -rw-r--r-- | depends/patches/qt/no_sdk_version_check.patch | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/depends/patches/qt/no_sdk_version_check.patch b/depends/patches/qt/no_sdk_version_check.patch new file mode 100644 index 0000000000..b16635b572 --- /dev/null +++ b/depends/patches/qt/no_sdk_version_check.patch @@ -0,0 +1,20 @@ +commit f5eb142cd04be2bc4ca610ed3b5b7e8ce3520ee3 +Author: fanquake <fanquake@gmail.com> +Date: Tue Jan 5 16:08:49 2021 +0800 + + Don't invoke macOS SDK version checking + + This tries to use xcrun which is not available when cross-compiling. + +diff --git a/qtbase/mkspecs/features/mac/default_post.prf b/qtbase/mkspecs/features/mac/default_post.prf +index 92a9112bca6..447e186eb26 100644 +--- a/qtbase/mkspecs/features/mac/default_post.prf ++++ b/qtbase/mkspecs/features/mac/default_post.prf +@@ -8,7 +8,6 @@ contains(TEMPLATE, .*app) { + !macx-xcode:if(isEmpty(BUILDS)|build_pass) { + # Detect changes to the platform SDK + QMAKE_EXTRA_VARIABLES += QMAKE_MAC_SDK QMAKE_MAC_SDK_VERSION QMAKE_XCODE_DEVELOPER_PATH +- QMAKE_EXTRA_INCLUDES += $$shell_quote($$PWD/sdk.mk) + } + + # Detect incompatible SDK versions |