1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

de-duplicate {mac,uikit}/default_post.prf re valid architectures

Browse Source 
Change-Id: Ie9d5a35a7f8578a2588ec004aab086d74986b0eb
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
This commit is contained in:
Oswald Buddenhagen 2016-12-23 15:36:19 +01:00
parent b5c809eb96
commit 70a7276840
2 changed files with 9 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
mkspecs/features/mac/default_post.prf
View File

@ -37,21 +37,22 @@ macx-xcode {
tvos: deployment_target = $$QMAKE_TVOS_DEPLOYMENT_TARGET tvos: deployment_target = $$QMAKE_TVOS_DEPLOYMENT_TARGET
watchos: deployment_target = $$QMAKE_WATCHOS_DEPLOYMENT_TARGET watchos: deployment_target = $$QMAKE_WATCHOS_DEPLOYMENT_TARGET
device|!simulator: device_archs = $$QMAKE_APPLE_DEVICE_ARCHS device|!simulator: VALID_DEVICE_ARCHS = $$QMAKE_APPLE_DEVICE_ARCHS
simulator: simulator_archs = $$QMAKE_APPLE_SIMULATOR_ARCHS simulator: VALID_SIMULATOR_ARCHS = $$QMAKE_APPLE_SIMULATOR_ARCHS
archs = $$device_archs $$simulator_archs # Note: uikit/default_post.prf relies on this variable as well.
VALID_ARCHS = $$VALID_DEVICE_ARCHS $$VALID_SIMULATOR_ARCHS
isEmpty(archs): \ isEmpty(VALID_ARCHS): \
error("QMAKE_APPLE_DEVICE_ARCHS or QMAKE_APPLE_SIMULATOR_ARCHS must contain at least one architecture") error("QMAKE_APPLE_DEVICE_ARCHS or QMAKE_APPLE_SIMULATOR_ARCHS must contain at least one architecture")
QMAKE_XARCH_CFLAGS = QMAKE_XARCH_CFLAGS =
QMAKE_XARCH_LFLAGS = QMAKE_XARCH_LFLAGS =
QMAKE_EXTRA_VARIABLES += QMAKE_XARCH_CFLAGS QMAKE_XARCH_LFLAGS QMAKE_EXTRA_VARIABLES += QMAKE_XARCH_CFLAGS QMAKE_XARCH_LFLAGS
single_arch: archs = $$first(archs) single_arch: VALID_ARCHS = $$first(VALID_ARCHS)
for (arch, archs) { for (arch, VALID_ARCHS) {
contains(simulator_archs, $$arch) { contains(VALID_SIMULATOR_ARCHS, $$arch) {
sdk = $$simulator.sdk sdk = $$simulator.sdk
version_identifier = $$simulator.deployment_identifier version_identifier = $$simulator.deployment_identifier
} else { } else {
@ -78,7 +79,7 @@ macx-xcode {
} }
QMAKE_CFLAGS_USE_PRECOMPILE = QMAKE_CFLAGS_USE_PRECOMPILE =
for (arch, archs) { for (arch, VALID_ARCHS) {
QMAKE_CFLAGS_USE_PRECOMPILE += \ QMAKE_CFLAGS_USE_PRECOMPILE += \
-Xarch_$${arch} \ -Xarch_$${arch} \
-include${QMAKE_PCH_OUTPUT_$${arch}} -include${QMAKE_PCH_OUTPUT_$${arch}}

9
mkspecs/features/uikit/default_post.prf
View File

@ -68,15 +68,6 @@ macx-xcode {
only_active_arch.build = debug only_active_arch.build = debug
QMAKE_MAC_XCODE_SETTINGS += only_active_arch QMAKE_MAC_XCODE_SETTINGS += only_active_arch
} else { } else {
VALID_ARCHS =
device|!simulator: VALID_ARCHS += $$QMAKE_APPLE_DEVICE_ARCHS
simulator: VALID_ARCHS += $$QMAKE_APPLE_SIMULATOR_ARCHS
isEmpty(VALID_ARCHS): \
error("QMAKE_APPLE_DEVICE_ARCHS or QMAKE_APPLE_SIMULATOR_ARCHS must contain at least one architecture")
single_arch: VALID_ARCHS = $$first(VALID_ARCHS)
ACTIVE_ARCHS = $(filter $(EXPORT_VALID_ARCHS), $(ARCHS)) ACTIVE_ARCHS = $(filter $(EXPORT_VALID_ARCHS), $(ARCHS))
ARCH_ARGS = $(foreach arch, $(if $(EXPORT_ACTIVE_ARCHS), $(EXPORT_ACTIVE_ARCHS), $(EXPORT_VALID_ARCHS)), -arch $(arch)) ARCH_ARGS = $(foreach arch, $(if $(EXPORT_ACTIVE_ARCHS), $(EXPORT_ACTIVE_ARCHS), $(EXPORT_VALID_ARCHS)), -arch $(arch))