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/buildtools | |
| 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/buildtools')
| -rw-r--r-- | src/buildtools/configure_host.pro | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/buildtools/configure_host.pro b/src/buildtools/configure_host.pro index fd27643ec..f1b3d47b0 100644 --- a/src/buildtools/configure_host.pro +++ b/src/buildtools/configure_host.pro @@ -4,8 +4,9 @@ TEMPLATE = aux # Pick up the host toolchain option(host_build) -GN_HOST_CPU = $$gnArch($$QMAKE_HOST.arch) -GN_TARGET_CPU = $$gnArch($$WEBENGINE_ARCH) +GN_HOST_CPU = $$gnArch($$QT_ARCH) +!isEmpty(QT_TARGET_ARCH): GN_TARGET_CPU = $$gnArch($$QT_TARGET_ARCH) +else: GN_TARGET_CPU = $$GN_HOST_CPU GN_OS = $$gnOS() clang: GN_CLANG = true @@ -15,11 +16,11 @@ use_gold_linker: GN_USE_GOLD=true else: GN_USE_GOLD=false GN_V8_HOST_CPU = $$GN_HOST_CPU -contains(GN_TARGET_CPU, "arm")|contains(GN_TARGET_CPU, "mips")|contains(GN_TARGET_CPU, "x86") { +contains(GN_TARGET_CPU, "arm")|contains(GN_TARGET_CPU, "mipsel")|contains(GN_TARGET_CPU, "x86") { # The v8 snapshot need a host that matches bitwidth, so we build makesnapshot to 32-bit variants of host. contains(GN_V8_HOST_CPU, x64): GN_V8_HOST_CPU = "x86" else: contains(GN_V8_HOST_CPU, arm64): GN_V8_HOST_CPU = "arm" - else: contains(GN_V8_HOST_CPU, mips64): GN_V8_HOST_CPU = "mips" + else: contains(GN_V8_HOST_CPU, mips64el): GN_V8_HOST_CPU = "mipsel" } # We always use the gcc_toolchain, because clang_toolchain is just |