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 /src/core | |
| 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 'src/core')
| -rw-r--r-- | src/core/config/linux.pri | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/core/config/linux.pri b/src/core/config/linux.pri index 076d8a3c5..60cfa6857 100644 --- a/src/core/config/linux.pri +++ b/src/core/config/linux.pri @@ -98,6 +98,8 @@ contains(QT_ARCH, "mips"):!host_build { host_build { gn_args += custom_toolchain=\"$$QTWEBENGINE_OUT_ROOT/src/toolchain:host\" + GN_HOST_CPU = $$gnArch($$QT_ARCH) + gn_args += host_cpu=\"$$GN_HOST_CPU\" # Don't bother trying to use system libraries in this case gn_args += use_glib=false gn_args += use_system_libffi=false @@ -106,9 +108,8 @@ host_build { gn_args += host_toolchain=\"$$QTWEBENGINE_OUT_ROOT/src/toolchain:host\" cross_compile { gn_args += v8_snapshot_toolchain=\"$$QTWEBENGINE_OUT_ROOT/src/toolchain:v8_snapshot\" - GN_HOST_CPU = $$gnArch($$QMAKE_HOST.arch) GN_TARGET_CPU = $$gnArch($$QT_ARCH) - gn_args += host_cpu=\"$$GN_HOST_CPU\" target_cpu=\"$$GN_TARGET_CPU\" + gn_args += target_cpu=\"$$GN_TARGET_CPU\" } !contains(QT_CONFIG, no-pkg-config) { # Strip '>2 /dev/null' from $$pkgConfigExecutable() |