diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-06-20 11:26:29 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-06-22 21:05:54 +0000 |
| commit | 77cf13a719b567df009f825c09c693e15d6ef651 (patch) | |
| tree | 6428b3d201bf9440e0b1e77cf9a62e6520a46865 /mkspecs | |
| parent | f6a72a415b62f5f0b1e72df3f88702df54103985 (diff) | |
Fix host architecture detection
Read the correct QT_ARCH and QT_TARGET_ARCH variables from QMAKE. This
fixes cases where toolchain arch does not match host arch (e.g. x86 tools
on x64).
Also removes unnecessary WEBENGINE_ARCH variable, and a mismatch in GN
mips names.
Task-number: QTBUG-61528
Change-Id: I11b050977ce6203c10d1776a15eb32efa4693290
Reviewed-by: Rolf Eike Beer <eb@emlix.com>
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/features/configure.prf | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/mkspecs/features/configure.prf b/mkspecs/features/configure.prf index c1e919603..f7a38ac12 100644 --- a/mkspecs/features/configure.prf +++ b/mkspecs/features/configure.prf @@ -133,10 +133,6 @@ defineTest(runConfigure) { cache(WEBENGINE_CONFIG, add, $$list($$WEBENGINE_CONFIG)) export(WEBENGINE_CONFIG) } - # Set a global WEBENGINE_ARCH for the target architecture we can also read from option(host_build) - WEBENGINE_ARCH = $$QT_ARCH - cache(WEBENGINE_ARCH) - export(WEBENGINE_ARCH) } unix:!darwin { |