diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-06-27 16:52:21 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-06-27 16:52:35 +0200 |
| commit | ec5a99b0515779ff5ec3df6bd657127b4e037823 (patch) | |
| tree | c5dc52e8892b6740123469276dcb303a81d9fd56 /src/core/gyp_run.pro | |
| parent | 56bea56b2d8fabc4b09d41531177a22d9297ce2c (diff) | |
| parent | 722732d1f089630ad517aef8f94325a51186b274 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: Ic6686df8f82f710a3441501b7eeaffe69fbcbdf7
Diffstat (limited to 'src/core/gyp_run.pro')
| -rw-r--r-- | src/core/gyp_run.pro | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/src/core/gyp_run.pro b/src/core/gyp_run.pro index a1b33e258..8c4aeb163 100644 --- a/src/core/gyp_run.pro +++ b/src/core/gyp_run.pro @@ -89,9 +89,16 @@ contains(QT_ARCH, "arm") { contains(QT_ARCH, "mips") { GYP_CONFIG += target_arch=mipsel - contains(QMAKE_CFLAGS, "mips32r6"): mips_arch_variant=\"r6\" - else: contains(QMAKE_CFLAGS, "mips32r2"): mips_arch_variant=\"r2\" - else: contains(QMAKE_CFLAGS, "mips32"): mips_arch_variant=\"r1\" + MARCH = $$extractCFlag("-march=.*") + !isEmpty(MARCH) { + equals(MARCH, "mips32r6"): GYP_CONFIG += mips_arch_variant=\"r6\" + else: equals(MARCH, "mips32r2"): GYP_CONFIG += mips_arch_variant=\"r2\" + else: equals(MARCH, "mips32"): GYP_CONFIG += mips_arch_variant=\"r1\" + } else { + contains(QMAKE_CFLAGS, "mips32r6"): GYP_CONFIG += mips_arch_variant=\"r6\" + else: contains(QMAKE_CFLAGS, "mips32r2"): GYP_CONFIG += mips_arch_variant=\"r2\" + else: contains(QMAKE_CFLAGS, "mips32"): GYP_CONFIG += mips_arch_variant=\"r1\" + } contains(QMAKE_CFLAGS, "-mdsp2"): GYP_CONFIG += mips_dsp_rev=2 else: contains(QMAKE_CFLAGS, "-mdsp"): GYP_CONFIG += mips_dsp_rev=1 |