From 4bab1b0d7c2462ee9c5369c949b45bc4dedc1194 Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Date: Mon, 8 May 2017 12:14:32 +0200
Subject: configure: don't emit empty GCC_MACHINE_DUMP to qdevice.pri

there is no point in doing that.

Change-Id: Ie09edeed340ea87eddb38980b0df7ed777ec6280
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
---
 configure.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'configure.json')

diff --git a/configure.json b/configure.json
index ae2aa22070..b4a87f5505 100644
--- a/configure.json
+++ b/configure.json
@@ -521,11 +521,11 @@
             "output": [ "prepareSpec", "prepareOptions", "preparePaths", "reloadSpec" ]
         },
         "machineTuple": {
-            "condition": "!config.linux || config.android || tests.machineTuple",
+            "condition": "config.linux && !config.android && tests.machineTuple",
             "output": [ "machineTuple" ]
         },
         "commit": {
-            "condition": "features.machineTuple",
+            "condition": "features.machineTuple || true",
             "output": [ "commitOptions" ]
         },
         "android-style-assets": {
-- 
cgit v1.2.3