diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-09-14 10:08:51 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-09-14 11:06:37 +0200 |
| commit | bdeb81b73122d6962ca4796c573dcbc636ccb195 (patch) | |
| tree | 946530bfe0f7bd506ea26633f8374fde5180c6cb /src/core/config/linux.pri | |
| parent | 529623a9f3590ac0ac3baf3ccece793c0ce7f825 (diff) | |
| parent | c7d46325e635d1fb4482b53dce866e2c55026a7e (diff) | |
Merge remote-tracking branch 'origin/5.9' into 5.10
Change-Id: I0860a46b981c1f711bec45d7a495bcec2a80ee1f
Diffstat (limited to 'src/core/config/linux.pri')
| -rw-r--r-- | src/core/config/linux.pri | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/config/linux.pri b/src/core/config/linux.pri index c2d41b4d0..c0f2f6289 100644 --- a/src/core/config/linux.pri +++ b/src/core/config/linux.pri @@ -41,7 +41,7 @@ cross_compile:!host_build { !isEmpty(TOOLCHAIN_SYSROOT): gn_args += target_sysroot=\"$${TOOLCHAIN_SYSROOT}\" } -contains(QT_ARCH, "arm"):!host_build { +contains(QT_ARCH, "arm") { # Extract ARM specific compiler options that we have to pass to gn, # but let gn figure out a default if an option is not present. MTUNE = $$extractCFlag("-mtune=.*") @@ -78,7 +78,7 @@ contains(QT_ARCH, "arm"):!host_build { else: contains(QMAKE_CFLAGS, "-mthumb"): gn_args += arm_use_thumb=true } -contains(QT_ARCH, "mips"):!host_build { +contains(QT_ARCH, "mips") { MARCH = $$extractCFlag("-march=.*") !isEmpty(MARCH) { equals(MARCH, "mips32r6"): gn_args += mips_arch_variant=\"r6\" |