AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix explicit -sdk iphoneos builds

Browse Source 
The order in which exclusive builds are added affects the order of
values in SUBTARGETS. xcodebuild.mk parses the value of SUBTARGETS in
the Makefile and selects the first entry, which would always be
release-iphonesimulator regardless of the build type. This obviously
caused -sdk iphoneos builds to fail.

This patch switches the order of in which exclusive builds are added so
that the entries which are not present in a particular build type are
always added last.

Change-Id: I306d6f7430c1dff3d741a8c5182b7af81d000e7f
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
This commit is contained in:
Jake Petroules 2016-09-30 11:10:49 -07:00 committed by Frederik Gladhorn
parent 3f8843f18d
commit d2b4a789c3
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
mkspecs/macx-ios-clang/features/resolve_config.prf
View File

@ -26,7 +26,12 @@ macx-xcode {
} else { } else {
iphonesimulator.name = Simulator iphonesimulator.name = Simulator
iphoneos.name = Device iphoneos.name = Device
addExclusiveBuilds(iphonesimulator, iphoneos)
# Switch the order to make sure that the first Makefile target is the right one
!contains(QT_CONFIG, simulator_and_device):contains(QMAKE_MAC_SDK, ^iphonesimulator.*): \
addExclusiveBuilds(iphonesimulator, iphoneos)
else: \
addExclusiveBuilds(iphoneos, iphonesimulator)
} }
equals(TEMPLATE, subdirs) { equals(TEMPLATE, subdirs) {