diff options
author | fanquake <fanquake@gmail.com> | 2020-09-04 08:54:19 +0800 |
---|---|---|
committer | fanquake <fanquake@gmail.com> | 2020-11-14 08:54:24 +0800 |
commit | fdde4c7ce624d4dbf72d38e9783c304d70430386 (patch) | |
tree | f79179594c0494242b2ddf30bd71f967938273cf /depends | |
parent | 49473ef211343a25658d7c2de17c92e3123ab33b (diff) | |
download | bitcoin-fdde4c7ce624d4dbf72d38e9783c304d70430386.tar.xz |
build: pass XCODE_VERSION through to qt macOS cross compile conf
This should mostly be a no-op, however it would seem to make more sense
that we pass through the XCODE_VERSION we now have in depends, rather
than leaving the version set to 4.3.
Diffstat (limited to 'depends')
-rw-r--r-- | depends/packages/qt.mk | 1 | ||||
-rw-r--r-- | depends/patches/qt/mac-qmake.conf | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/depends/packages/qt.mk b/depends/packages/qt.mk index 91c3fcd23b..d86ea10fd0 100644 --- a/depends/packages/qt.mk +++ b/depends/packages/qt.mk @@ -125,6 +125,7 @@ $(package)_config_opts_darwin += -device-option MAC_SDK_VERSION=$(OSX_SDK_VERSIO $(package)_config_opts_darwin += -device-option CROSS_COMPILE="$(host)-" $(package)_config_opts_darwin += -device-option MAC_MIN_VERSION=$(OSX_MIN_VERSION) $(package)_config_opts_darwin += -device-option MAC_TARGET=$(host) +$(package)_config_opts_darwin += -device-option XCODE_VERSION=$(XCODE_VERSION) endif $(package)_config_opts_linux = -qt-xkbcommon-x11 diff --git a/depends/patches/qt/mac-qmake.conf b/depends/patches/qt/mac-qmake.conf index 4cd96df29f..ca5d22ac61 100644 --- a/depends/patches/qt/mac-qmake.conf +++ b/depends/patches/qt/mac-qmake.conf @@ -6,7 +6,7 @@ include(../common/gcc-base-mac.conf) include(../common/clang.conf) include(../common/clang-mac.conf) QMAKE_MAC_SDK_PATH=$${MAC_SDK_PATH} -QMAKE_XCODE_VERSION=4.3 +QMAKE_XCODE_VERSION = $${XCODE_VERSION} QMAKE_XCODE_DEVELOPER_PATH=/Developer QMAKE_MACOSX_DEPLOYMENT_TARGET = $${MAC_MIN_VERSION} QMAKE_MAC_SDK=macosx |