Commit 369c64bc authored by Allan Sandfeld Jensen's avatar Allan Sandfeld Jensen
Browse files

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: default avatarJoerg Bornemann <joerg.bornemann@qt.io>
Showing with 2 additions and 2 deletions
...@@ -41,7 +41,7 @@ cross_compile:!host_build { ...@@ -41,7 +41,7 @@ cross_compile:!host_build {
!isEmpty(TOOLCHAIN_SYSROOT): gn_args += target_sysroot=\"$${TOOLCHAIN_SYSROOT}\" !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, # 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. # but let gn figure out a default if an option is not present.
MTUNE = $$extractCFlag("-mtune=.*") MTUNE = $$extractCFlag("-mtune=.*")
...@@ -78,7 +78,7 @@ contains(QT_ARCH, "arm"):!host_build { ...@@ -78,7 +78,7 @@ contains(QT_ARCH, "arm"):!host_build {
else: contains(QMAKE_CFLAGS, "-mthumb"): gn_args += arm_use_thumb=true else: contains(QMAKE_CFLAGS, "-mthumb"): gn_args += arm_use_thumb=true
} }
contains(QT_ARCH, "mips"):!host_build { contains(QT_ARCH, "mips") {
MARCH = $$extractCFlag("-march=.*") MARCH = $$extractCFlag("-march=.*")
!isEmpty(MARCH) { !isEmpty(MARCH) {
equals(MARCH, "mips32r6"): gn_args += mips_arch_variant=\"r6\" equals(MARCH, "mips32r6"): gn_args += mips_arch_variant=\"r6\"
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment