From c0013bfd3320ce1ebddd0fab885b0e6cabe7c861 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Fri, 28 Apr 2017 13:54:41 +0200 Subject: 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 --- configure.pri | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'configure.pri') 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 { -- cgit v1.2.3