qiurui
/
qtbase
mirror of https://github.com/qt/qtbase.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix target ABI configure detection 

Amend commit e6bf237669 to correctly
cache the abi in config.cache and set QT_BUILDABI to the correct target
ABI when cross-compiling.

Task-number: QTBUG-60441
Change-Id: I4ebfce9d6266be2a3225034fbf3aff08e7fdc5d5
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
This commit is contained in:
Simon Hausmann 2017-04-28 13:54:41 +02:00
parent c12b96daf2
commit c0013bfd33
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
configure.pri
View File

@ -278,7 +278,7 @@ defineTest(qtConfTest_architecture) {
export($${1}.buildabi)
qtLog("Detected architecture: $$eval($${1}.arch) ($$eval($${1}.subarch))")
$${1}.cache += arch subarch
$${1}.cache += arch subarch buildabi
export($${1}.cache)
return(true)
}
@ -893,11 +893,12 @@ defineTest(qtConfOutput_architecture) {
publicPro = \
"host_build {" \
" QT_ARCH = $$host_arch" \
" QT_BUILDABI = $$host_buildabi" \
" QT_TARGET_ARCH = $$arch" \
" QT_TARGET_BUILDABI = $$buildabi" \
"} else {" \
" QT_ARCH = $$arch" \
" QT_BUILDABI = $$host_buildabi" \
" QT_BUILDABI = $$buildabi" \
"}"
} else {