From eb1e41fa6106925c8794effcebd52843a56c6d31 Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Thu, 2 Mar 2017 10:10:46 +0100 Subject: Fix cross-compiled desktop linux builds MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit With embedded-builds now being a configure option we can have cross compiled desktop builds, and should support them. Change-Id: I43d9f26dc13bc1709c24d1420868e3c8bbbc458f Reviewed-by: Michael Brüning --- src/core/config/embedded_linux.pri | 5 ----- src/core/config/linux.pri | 5 +++++ 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/core/config/embedded_linux.pri b/src/core/config/embedded_linux.pri index 2c9338693..51d7e2671 100644 --- a/src/core/config/embedded_linux.pri +++ b/src/core/config/embedded_linux.pri @@ -17,11 +17,6 @@ use?(gn) { use?(icecc) { gn_args += use_debug_fission=false } - - cross_compile:!host_build { - TOOLCHAIN_SYSROOT = $$[QT_SYSROOT] - !isEmpty(TOOLCHAIN_SYSROOT): gn_args += target_sysroot=\"$${TOOLCHAIN_SYSROOT}\" - } } GYP_CONFIG += \ diff --git a/src/core/config/linux.pri b/src/core/config/linux.pri index 0c15a7589..5f3ac8e67 100644 --- a/src/core/config/linux.pri +++ b/src/core/config/linux.pri @@ -35,6 +35,11 @@ use?(gn) { is_clang=false } + cross_compile:!host_build { + TOOLCHAIN_SYSROOT = $$[QT_SYSROOT] + !isEmpty(TOOLCHAIN_SYSROOT): gn_args += target_sysroot=\"$${TOOLCHAIN_SYSROOT}\" + } + host_build { gn_args += custom_toolchain=\"$$QTWEBENGINE_OUT_ROOT/src/toolchain:host\" # Don't bother trying to use system libraries in this case -- cgit v1.2.3