diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-08-29 15:17:15 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-08-29 14:25:37 +0000 |
| commit | d8b43e6880dbffcba08102b92f18a86e2dccbd00 (patch) | |
| tree | b0845db3fd4865d096055aac8cdf8868b7d683bb /src | |
| parent | 67f49277e68693dde6fd9ad0dd5b58885c33599c (diff) | |
Fix multilib builds with different archs of toolchain and system
Set host_cpu to ensure GN gets on the right path matching the host of
the toolchain we give it in host_toolchain.
Task-number: QTBUG-62673
Change-Id: I99d6dfdbe4cee30bc240049b656d1ec73becce8a
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/config/linux.pri | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/core/config/linux.pri b/src/core/config/linux.pri index 714c864d1..a5ad4c325 100644 --- a/src/core/config/linux.pri +++ b/src/core/config/linux.pri @@ -106,10 +106,14 @@ host_build { } else { gn_args += custom_toolchain=\"$$QTWEBENGINE_OUT_ROOT/src/toolchain:target\" gn_args += host_toolchain=\"$$QTWEBENGINE_OUT_ROOT/src/toolchain:host\" + GN_TARGET_CPU = $$gnArch($$QT_ARCH) cross_compile { gn_args += v8_snapshot_toolchain=\"$$QTWEBENGINE_OUT_ROOT/src/toolchain:v8_snapshot\" - GN_TARGET_CPU = $$gnArch($$QT_ARCH) + # FIXME: we should set host_cpu in case host-toolchain doesn't match os arch, + # but currently we don't it available at this point gn_args += target_cpu=\"$$GN_TARGET_CPU\" + } else { + gn_args += host_cpu=\"$$GN_TARGET_CPU\" } !contains(QT_CONFIG, no-pkg-config) { # Strip '>2 /dev/null' from $$pkgConfigExecutable() |