diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-03-02 10:10:46 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-03-02 09:44:57 +0000 |
| commit | eb1e41fa6106925c8794effcebd52843a56c6d31 (patch) | |
| tree | 5c6b89fde3d264b7dca5a412be508d93f66b490f /src/core | |
| parent | baa7fe0187afdc8523ceb047c648f0b1194d8fc9 (diff) | |
Fix cross-compiled desktop linux builds
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 <michael.bruning@qt.io>
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/config/embedded_linux.pri | 5 | ||||
| -rw-r--r-- | 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 |