diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2016-12-23 15:36:19 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2016-12-30 10:25:32 +0000 |
| commit | 70a72768409a89e770e1279cfb3e8b59df21a11c (patch) | |
| tree | 8e73eb3be092922fc9ff3e4595bb3cd36f38f64f /mkspecs/features/mac/default_post.prf | |
| parent | b5c809eb96cc1348cee6083e7141fb1c505943f6 (diff) | |
de-duplicate {mac,uikit}/default_post.prf re valid architectures
Change-Id: Ie9d5a35a7f8578a2588ec004aab086d74986b0eb
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
Diffstat (limited to 'mkspecs/features/mac/default_post.prf')
| -rw-r--r-- | mkspecs/features/mac/default_post.prf | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/mkspecs/features/mac/default_post.prf b/mkspecs/features/mac/default_post.prf index 2ac4262129..d93c6ed27c 100644 --- a/mkspecs/features/mac/default_post.prf +++ b/mkspecs/features/mac/default_post.prf @@ -37,21 +37,22 @@ macx-xcode { tvos: deployment_target = $$QMAKE_TVOS_DEPLOYMENT_TARGET watchos: deployment_target = $$QMAKE_WATCHOS_DEPLOYMENT_TARGET - device|!simulator: device_archs = $$QMAKE_APPLE_DEVICE_ARCHS - simulator: simulator_archs = $$QMAKE_APPLE_SIMULATOR_ARCHS - archs = $$device_archs $$simulator_archs + device|!simulator: VALID_DEVICE_ARCHS = $$QMAKE_APPLE_DEVICE_ARCHS + simulator: VALID_SIMULATOR_ARCHS = $$QMAKE_APPLE_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") 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) { - contains(simulator_archs, $$arch) { + for (arch, VALID_ARCHS) { + contains(VALID_SIMULATOR_ARCHS, $$arch) { sdk = $$simulator.sdk version_identifier = $$simulator.deployment_identifier } else { @@ -78,7 +79,7 @@ macx-xcode { } QMAKE_CFLAGS_USE_PRECOMPILE = - for (arch, archs) { + for (arch, VALID_ARCHS) { QMAKE_CFLAGS_USE_PRECOMPILE += \ -Xarch_$${arch} \ -include${QMAKE_PCH_OUTPUT_$${arch}} |