forked from bitcoin/bitcoin
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
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.
- Loading branch information
Showing
2 changed files
with
22 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,20 @@ | ||
commit f5eb142cd04be2bc4ca610ed3b5b7e8ce3520ee3 | ||
Author: fanquake <[email protected]> | ||
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 |