Skip to content

Commit 763793b

Browse files
committed
build, qt: Fix wrong cross-compiling detection on macOS
1 parent 3098272 commit 763793b

File tree

2 files changed

+1
-3
lines changed

2 files changed

+1
-3
lines changed

depends/packages/qt.mk

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,14 +116,13 @@ $(package)_config_opts_darwin = -no-dbus
116116
$(package)_config_opts_darwin += -no-opengl
117117
$(package)_config_opts_darwin += -pch
118118
$(package)_config_opts_darwin += -no-feature-corewlan
119-
$(package)_config_opts_darwin += -device-option QMAKE_MACOSX_DEPLOYMENT_TARGET=$(OSX_MIN_VERSION)
119+
$(package)_config_opts_darwin += QMAKE_MACOSX_DEPLOYMENT_TARGET=$(OSX_MIN_VERSION)
120120

121121
ifneq ($(build_os),darwin)
122122
$(package)_config_opts_darwin += -xplatform macx-clang-linux
123123
$(package)_config_opts_darwin += -device-option MAC_SDK_PATH=$(OSX_SDK)
124124
$(package)_config_opts_darwin += -device-option MAC_SDK_VERSION=$(OSX_SDK_VERSION)
125125
$(package)_config_opts_darwin += -device-option CROSS_COMPILE="$(host)-"
126-
$(package)_config_opts_darwin += -device-option MAC_MIN_VERSION=$(OSX_MIN_VERSION)
127126
$(package)_config_opts_darwin += -device-option MAC_TARGET=$(host)
128127
$(package)_config_opts_darwin += -device-option XCODE_VERSION=$(XCODE_VERSION)
129128
endif

depends/patches/qt/mac-qmake.conf

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ include(../common/clang-mac.conf)
88
QMAKE_MAC_SDK_PATH=$${MAC_SDK_PATH}
99
QMAKE_XCODE_VERSION = $${XCODE_VERSION}
1010
QMAKE_XCODE_DEVELOPER_PATH=/Developer
11-
QMAKE_MACOSX_DEPLOYMENT_TARGET = $${MAC_MIN_VERSION}
1211
QMAKE_MAC_SDK=macosx
1312
QMAKE_MAC_SDK.macosx.Path = $${MAC_SDK_PATH}
1413
QMAKE_MAC_SDK.macosx.platform_name = macosx

0 commit comments

Comments
 (0)