From 59985b3c291f769cfc24cf361367757fce229397 Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Date: Fri, 7 Oct 2016 20:16:58 +0200
Subject: fix xcodebuilds without -sdk iphonesimulator

the order of the arguments passed to addExclusiveBuilds() determines the
name of the CONFIG flag which actually enables the mode. that is
historically fixed to iphonesimulator_and_iphoneos and we cannot just
change the order.

to get around this, add a new "overload" of the function which allows
specifying the flag independently from the order of the builds, and make
use of it in ios' resolve_config.prf.

amends d2b4a789c.

Change-Id: Ia3fabea0c0c30beae680b57e75bdcdf35ef6503d
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
---
 mkspecs/features/exclusive_builds.prf              | 18 +++++++++++-------
 mkspecs/macx-ios-clang/features/resolve_config.prf |  4 ++--
 2 files changed, 13 insertions(+), 9 deletions(-)

(limited to 'mkspecs')

diff --git a/mkspecs/features/exclusive_builds.prf b/mkspecs/features/exclusive_builds.prf
index 5d06198ae4..f40cc99172 100644
--- a/mkspecs/features/exclusive_builds.prf
+++ b/mkspecs/features/exclusive_builds.prf
@@ -1,12 +1,9 @@
 
-defineTest(addExclusiveBuilds) {
-    lessThan(ARGC, 2): \
-        error("addExclusiveBuilds() requires at least two arguments")
-
-    !$$join(ARGS, _and_):!fix_output_dirs: \
+defineTest(addExclusiveBuildsProper) {
+    !$$1:!fix_output_dirs: \
         return(true)
 
-    for(build, ARGS) {
+    for(build, 2) {
         isEmpty($${build}.name) {
             $${build}.name = $$title($$build)
             export($${build}.name)
@@ -20,7 +17,7 @@ defineTest(addExclusiveBuilds) {
             export($${build}.dir_affix)
         }
 
-        $${build}.exclusive = $$ARGS
+        $${build}.exclusive = $$2
         export($${build}.exclusive)
 
         QMAKE_EXCLUSIVE_BUILDS += $$build
@@ -33,6 +30,13 @@ defineTest(addExclusiveBuilds) {
     return(true)
 }
 
+defineTest(addExclusiveBuilds) {
+    lessThan(ARGC, 2): \
+        error("addExclusiveBuilds() requires at least two arguments")
+
+    addExclusiveBuildsProper($$join(ARGS, _and_), $$ARGS)
+}
+
 # Default directories to process
 QMAKE_DIR_REPLACE = OBJECTS_DIR MOC_DIR RCC_DIR PRECOMPILED_DIR QGLTF_DIR DESTDIR
 QMAKE_DIR_REPLACE_SANE += QGLTF_DIR
diff --git a/mkspecs/macx-ios-clang/features/resolve_config.prf b/mkspecs/macx-ios-clang/features/resolve_config.prf
index 64db2252cb..904296aea6 100644
--- a/mkspecs/macx-ios-clang/features/resolve_config.prf
+++ b/mkspecs/macx-ios-clang/features/resolve_config.prf
@@ -29,9 +29,9 @@ macx-xcode {
 
     # 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)
+        addExclusiveBuildsProper(iphonesimulator_and_iphoneos, iphonesimulator iphoneos)
     else: \
-        addExclusiveBuilds(iphoneos, iphonesimulator)
+        addExclusiveBuildsProper(iphonesimulator_and_iphoneos, iphoneos iphonesimulator)
 }
 
 equals(TEMPLATE, subdirs) {
-- 
cgit v1.2.3