diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-06-12 12:36:17 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-06-12 13:05:13 +0000 |
| commit | 05f97e2c14ed667f015809adedcb4628de7206f5 (patch) | |
| tree | d73ee847f747336ab4a174daf43e6000ff07268d | |
| parent | a5333cc77c2895be04057cba96095063cee6d879 (diff) | |
Always set a host toolchain
If we don't give Chromium a host toolchain it will pick one of its own
overriding which compiler should be used, and breaking native builds
on non-x86 architectuers.
Task-number: QTBUG-61128
Change-Id: Ia25a4f43a28214003abcb11dc75a0e57064f76a7
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
| -rw-r--r-- | src/core/config/linux.pri | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/config/linux.pri b/src/core/config/linux.pri index 24951cd07..076d8a3c5 100644 --- a/src/core/config/linux.pri +++ b/src/core/config/linux.pri @@ -103,8 +103,8 @@ host_build { gn_args += use_system_libffi=false } else { gn_args += custom_toolchain=\"$$QTWEBENGINE_OUT_ROOT/src/toolchain:target\" + gn_args += host_toolchain=\"$$QTWEBENGINE_OUT_ROOT/src/toolchain:host\" cross_compile { - gn_args += host_toolchain=\"$$QTWEBENGINE_OUT_ROOT/src/toolchain:host\" 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) |