summaryrefslogtreecommitdiffstats
path: root/configure.json
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@qt.io>2017-05-08 12:14:32 +0200
committerOswald Buddenhagen <oswald.buddenhagen@qt.io>2018-04-25 18:53:33 +0000
commit4bab1b0d7c2462ee9c5369c949b45bc4dedc1194 (patch)
tree5a5d80a1d053cd57536899a0c841d1cae983772a /configure.json
parent75587c8030ff8057b90200cb20cff1e4549c00b5 (diff)
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>
Diffstat (limited to 'configure.json')
-rw-r--r--configure.json4
1 files changed, 2 insertions, 2 deletions
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": {