summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@theqtcompany.com>2016-06-24 13:17:16 +0200
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2016-06-24 11:46:38 +0000
commit722732d1f089630ad517aef8f94325a51186b274 (patch)
treec82d77fec6fd69e14b78282cfc80e8f56dce11de
parentcc8fc6ca09e86a0433d69aaa8c4512da27790049 (diff)
Fix detection of MIPS architucture revision
We were not handling -march= arguments and we were not setting the result in GYP_CONFIG. Task-number: QTBUG-54336 Change-Id: I63e45f153aa46d5879aa968aa6c3d898ef58855e Reviewed-by: Michael BrĂ¼ning <michael.bruning@qt.io>
-rw-r--r--src/core/gyp_run.pro13
1 files changed, 10 insertions, 3 deletions
diff --git a/src/core/gyp_run.pro b/src/core/gyp_run.pro
index 767bd6ac1..36548ff6b 100644
--- a/src/core/gyp_run.pro
+++ b/src/core/gyp_run.pro
@@ -89,9 +89,16 @@ contains(QT_ARCH, "mips") {
!cross_compile: GYP_CONFIG += sysroot=\"\"
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