summaryrefslogtreecommitdiffstats
path: root/src/core/gyp_run.pro
diff options
context:
space:
mode:
authorZeno Albisser <zeno.albisser@digia.com>2014-04-25 21:32:25 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-04-28 12:53:11 +0200
commit96108bc71996279395a3966e79bb37577e9e9be7 (patch)
tree63461294b2237cb46dbad175cd533bc8d8119377 /src/core/gyp_run.pro
parentdc49175b06e1f7f4736b4c54b598b7167d794aff (diff)
There is no neon on arm pre v7.
Change-Id: I0a446f916627ec2519c59fd101a140bf21f1a1b3 Reviewed-by: Andras Becsi <andras.becsi@digia.com>
Diffstat (limited to 'src/core/gyp_run.pro')
-rw-r--r--src/core/gyp_run.pro2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/gyp_run.pro b/src/core/gyp_run.pro
index ff8cf95e6..9bfa6268b 100644
--- a/src/core/gyp_run.pro
+++ b/src/core/gyp_run.pro
@@ -63,7 +63,7 @@ cross_compile {
# about the mfpu option.
contains(MFPU, "neon"): GYP_ARGS += "-D arm_fpu=\"$$MFPU\" -D arm_neon=1"
else:!lessThan(MARMV, 7): GYP_ARGS += "-D arm_neon=0 -D arm_neon_optional=1"
- else: GYP_ARGS += "-D arm_fpu=\"$$MFPU\""
+ else: GYP_ARGS += "-D arm_fpu=\"$$MFPU\" -D arm_neon=0 -D arm_neon_optional=0"
}
contains(QMAKE_CFLAGS, "-mthumb"): GYP_ARGS += "-D arm_thumb=1"