diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2017-04-28 13:54:41 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2017-05-02 10:32:36 +0000 |
| commit | c0013bfd3320ce1ebddd0fab885b0e6cabe7c861 (patch) | |
| tree | 2ee0745cecd5dc7016cd6ec220cdcf924ccc96eb | |
| parent | c12b96daf2195c475c086f8f9be833aa0e28b26c (diff) | |
Fix target ABI configure detection
Amend commit e6bf2376697975313b7ccd3f9bcebb869bb0b04c 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>
| -rw-r--r-- | configure.pri | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/configure.pri b/configure.pri index dc2764ce9d..be1b166080 100644 --- a/configure.pri +++ b/configure.pri @@ -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 { |