Skip to content

Commit fdde4c7

Browse files
committed
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.
1 parent 49473ef commit fdde4c7

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

depends/packages/qt.mk

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,7 @@ $(package)_config_opts_darwin += -device-option MAC_SDK_VERSION=$(OSX_SDK_VERSIO
125125
$(package)_config_opts_darwin += -device-option CROSS_COMPILE="$(host)-"
126126
$(package)_config_opts_darwin += -device-option MAC_MIN_VERSION=$(OSX_MIN_VERSION)
127127
$(package)_config_opts_darwin += -device-option MAC_TARGET=$(host)
128+
$(package)_config_opts_darwin += -device-option XCODE_VERSION=$(XCODE_VERSION)
128129
endif
129130

130131
$(package)_config_opts_linux = -qt-xkbcommon-x11

depends/patches/qt/mac-qmake.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ include(../common/gcc-base-mac.conf)
66
include(../common/clang.conf)
77
include(../common/clang-mac.conf)
88
QMAKE_MAC_SDK_PATH=$${MAC_SDK_PATH}
9-
QMAKE_XCODE_VERSION=4.3
9+
QMAKE_XCODE_VERSION = $${XCODE_VERSION}
1010
QMAKE_XCODE_DEVELOPER_PATH=/Developer
1111
QMAKE_MACOSX_DEPLOYMENT_TARGET = $${MAC_MIN_VERSION}
1212
QMAKE_MAC_SDK=macosx

0 commit comments

Comments
 (0)