From 70a72768409a89e770e1279cfb3e8b59df21a11c Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Date: Fri, 23 Dec 2016 15:36:19 +0100
Subject: de-duplicate {mac,uikit}/default_post.prf re valid architectures

Change-Id: Ie9d5a35a7f8578a2588ec004aab086d74986b0eb
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
---
 mkspecs/features/mac/default_post.prf   | 17 +++++++++--------
 mkspecs/features/uikit/default_post.prf |  9 ---------
 2 files changed, 9 insertions(+), 17 deletions(-)

(limited to 'mkspecs')

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}}
diff --git a/mkspecs/features/uikit/default_post.prf b/mkspecs/features/uikit/default_post.prf
index 6e23e23a6a..dc4effd7f1 100644
--- a/mkspecs/features/uikit/default_post.prf
+++ b/mkspecs/features/uikit/default_post.prf
@@ -68,15 +68,6 @@ macx-xcode {
     only_active_arch.build = debug
     QMAKE_MAC_XCODE_SETTINGS += only_active_arch
 } 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))
     ARCH_ARGS = $(foreach arch, $(if $(EXPORT_ACTIVE_ARCHS), $(EXPORT_ACTIVE_ARCHS), $(EXPORT_VALID_ARCHS)), -arch $(arch))
 
-- 
cgit v1.2.3