From 96108bc71996279395a3966e79bb37577e9e9be7 Mon Sep 17 00:00:00 2001
From: Zeno Albisser <zeno.albisser@digia.com>
Date: Fri, 25 Apr 2014 21:32:25 +0200
Subject: There is no neon on arm pre v7.

Change-Id: I0a446f916627ec2519c59fd101a140bf21f1a1b3
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
---
 src/core/gyp_run.pro | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/core/gyp_run.pro')

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"
-- 
cgit v1.2.3