diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2018-02-20 12:33:23 +0100 |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@intel.com> | 2018-02-22 21:39:36 +0000 |
| commit | 5cfd5fd9d7ece7e1eb3c4d2be8ec342b376acf38 (patch) | |
| tree | 4210521b95222721371bb242a685b296eaed65b2 /configure.pri | |
| parent | d98f17d4348ebf52bef7a02c3134d67bbee0a55d (diff) | |
configure: introduce 'subarch' term to expression evaluator
... and make use of it.
it's a logical continuation of the 'arch' term, and will be used also in
qt3d's configure.
Started-by: Thiago Macieira <thiago.macieira@intel.com>
Change-Id: I940917d6763842499b18fffd1514c96889a0cc63
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'configure.pri')
| -rw-r--r-- | configure.pri | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/configure.pri b/configure.pri index a67860fba0..7185647e44 100644 --- a/configure.pri +++ b/configure.pri @@ -366,12 +366,6 @@ defineTest(qtConfTest_detectPkgConfig) { return(true) } -defineTest(qtConfTest_subarch) { - subarch = $$eval($${1}.subarch) - contains($${currentConfig}.tests.architecture.subarch, $${subarch}): return(true) - return(false) -} - defineTest(qtConfTest_buildParts) { parts = $$config.input.make isEmpty(parts) { @@ -914,6 +908,7 @@ defineTest(qtConfOutput_sanitizer) { defineTest(qtConfOutput_architecture) { arch = $$qtConfEvaluate("tests.architecture.arch") + subarch = $$qtConfEvaluate('tests.architecture.subarch') buildabi = $$qtConfEvaluate("tests.architecture.buildabi") $$qtConfEvaluate("features.cross_compile") { @@ -924,7 +919,7 @@ defineTest(qtConfOutput_architecture) { "host_build {" \ " QT_CPU_FEATURES.$$host_arch = $$qtConfEvaluate('tests.host_architecture.subarch')" \ "} else {" \ - " QT_CPU_FEATURES.$$arch = $$qtConfEvaluate('tests.architecture.subarch')" \ + " QT_CPU_FEATURES.$$arch = $$subarch" \ "}" publicPro = \ "host_build {" \ @@ -939,7 +934,7 @@ defineTest(qtConfOutput_architecture) { } else { privatePro = \ - "QT_CPU_FEATURES.$$arch = $$qtConfEvaluate('tests.architecture.subarch')" + "QT_CPU_FEATURES.$$arch = $$subarch" publicPro = \ "QT_ARCH = $$arch" \ "QT_BUILDABI = $$buildabi" @@ -950,9 +945,11 @@ defineTest(qtConfOutput_architecture) { $${currentConfig}.output.privatePro += $$privatePro export($${currentConfig}.output.privatePro) - # setup QT_ARCH variable used by qtConfEvaluate + # setup QT_ARCH and QT_CPU_FEATURES variables used by qtConfEvaluate QT_ARCH = $$arch export(QT_ARCH) + QT_CPU_FEATURES.$$arch = $$subarch + export(QT_CPU_FEATURES.$$arch) } defineTest(qtConfOutput_qreal) { |