diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-09-04 13:47:58 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-09-08 11:58:23 +0000 |
commit | 369c64bc472ef526a7e064140a412f4398a36483 (patch) | |
tree | 93664ef058544d6f94acd6f99ca2dddbafb3e187 /src/core | |
parent | ad55613c2648edb67353c3882d1956b54fc323b4 (diff) |
Also set MIPS/Arm flags for host-builds
QT_ARCH is the current architecture, and if the host is Arm or MIPS, we
also need the flags there.
Task-number: QTBUG-61846
Change-Id: I38f826e061eff900f6e27f4de0fc913323cf5e3e
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'src/core')
-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 28278e903..831e1952c 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\" |