1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make build ABI available as qmake variable

Browse Source 
This is needed to encode the correct ABI into the generated qml caches.
It is identical with the return value of QSysInfo::buildAbi().

Change-Id: I2d581b22326da4220f412ab4f517156f4ba31897
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
This commit is contained in:
Simon Hausmann 2017-03-27 10:54:59 +02:00
parent a6bbaa08bf
commit e6bf237669
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config.tests/arch/arch.cpp
View File

@ -284,8 +284,12 @@ const char msg2[] = "==Qt=magic=Qt== Sub-architecture:"
#endif #endif
""; "";
extern const char msg3[];
const char msg3[] = "==Qt=magic=Qt== Build-ABI:" ARCH_FULL;
int main() int main()
{ {
puts(msg); puts(msg);
puts(msg2); puts(msg2);
puts(msg3);
} }

12
configure.pri
View File

@ -258,15 +258,18 @@ defineTest(qtConfTest_architecture) {
arch_magic = ".*==Qt=magic=Qt== Architecture:([^\\0]*).*" arch_magic = ".*==Qt=magic=Qt== Architecture:([^\\0]*).*"
subarch_magic = ".*==Qt=magic=Qt== Sub-architecture:([^\\0]*).*" subarch_magic = ".*==Qt=magic=Qt== Sub-architecture:([^\\0]*).*"
buildabi_magic = ".*==Qt=magic=Qt== Build-ABI:([^\\0]*).*"
!contains(content, $$arch_magic)|!contains(content, $$subarch_magic): \ !contains(content, $$arch_magic)|!contains(content, $$subarch_magic)|!contains(content, $$buildabi_magic): \
error("$$eval($${1}.label) detection binary does not contain expected data.") error("$$eval($${1}.label) detection binary does not contain expected data.")
$${1}.arch = $$replace(content, $$arch_magic, "\\1") $${1}.arch = $$replace(content, $$arch_magic, "\\1")
$${1}.subarch = $$replace(content, $$subarch_magic, "\\1") $${1}.subarch = $$replace(content, $$subarch_magic, "\\1")
$${1}.subarch = $$split($${1}.subarch, " ") $${1}.subarch = $$split($${1}.subarch, " ")
$${1}.buildabi = $$replace(content, $$buildabi_magic, "\\1")
export($${1}.arch) export($${1}.arch)
export($${1}.subarch) export($${1}.subarch)
export($${1}.buildabi)
qtLog("Detected architecture: $$eval($${1}.arch) ($$eval($${1}.subarch))") qtLog("Detected architecture: $$eval($${1}.arch) ($$eval($${1}.subarch))")
$${1}.cache += arch subarch $${1}.cache += arch subarch
@ -869,9 +872,11 @@ defineTest(qtConfOutput_shared) {
defineTest(qtConfOutput_architecture) { defineTest(qtConfOutput_architecture) {
arch = $$qtConfEvaluate("tests.architecture.arch") arch = $$qtConfEvaluate("tests.architecture.arch")
buildabi = $$qtConfEvaluate("tests.architecture.buildabi")
$$qtConfEvaluate("features.cross_compile") { $$qtConfEvaluate("features.cross_compile") {
host_arch = $$qtConfEvaluate("tests.host_architecture.arch") host_arch = $$qtConfEvaluate("tests.host_architecture.arch")
host_buildabi = $$qtConfEvaluate("tests.host_architecture.buildabi")
privatePro = \ privatePro = \
"host_build {" \ "host_build {" \
@ -883,15 +888,18 @@ defineTest(qtConfOutput_architecture) {
"host_build {" \ "host_build {" \
" QT_ARCH = $$host_arch" \ " QT_ARCH = $$host_arch" \
" QT_TARGET_ARCH = $$arch" \ " QT_TARGET_ARCH = $$arch" \
" QT_TARGET_BUILDABI = $$buildabi" \
"} else {" \ "} else {" \
" QT_ARCH = $$arch" \ " QT_ARCH = $$arch" \
" QT_BUILDABI = $$host_buildabi" \
"}" "}"
} else { } else {
privatePro = \ privatePro = \
"QT_CPU_FEATURES.$$arch = $$qtConfEvaluate('tests.architecture.subarch')" "QT_CPU_FEATURES.$$arch = $$qtConfEvaluate('tests.architecture.subarch')"
publicPro = \ publicPro = \
"QT_ARCH = $$arch" "QT_ARCH = $$arch" \
"QT_BUILDABI = $$buildabi"
} }
$${currentConfig}.output.publicPro += $$publicPro $${currentConfig}.output.publicPro += $$publicPro