summaryrefslogtreecommitdiffstats
path: root/src/core/gyp_run.pro
diff options
context:
space:
mode:
authorDonald Carr <sirspudd@gmail.com>2016-03-15 18:48:24 -0700
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2016-09-27 10:53:08 +0000
commit4b515da7dca16d5cd34054c6f3436ff8b97d562c (patch)
tree9c3fc4c3742133fddeb16544ae35dbe382ee47b8 /src/core/gyp_run.pro
parent36feb681a97b3dd690a54d2eafd58081036992f1 (diff)
Include neon support for any -fpu=.*neon.*
Change-Id: I9c571c823b6fa2411e003799f7ff8627ef6e1d5e Reviewed-by: Kai Koehne <kai.koehne@qt.io> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
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 ee62e5d72..30d62e0bf 100644
--- a/src/core/gyp_run.pro
+++ b/src/core/gyp_run.pro
@@ -76,7 +76,7 @@ contains(QT_ARCH, "arm") {
# If the toolchain does not explicitly specify to use NEON instructions
# we use arm_neon_optional for ARMv7 and newer and let chromium decide
# about the mfpu option.
- contains(MFPU, "neon")|contains(MFPU, "neon-vfpv4"): GYP_CONFIG += arm_fpu=\"$$MFPU\" arm_neon=1
+ contains(MFPU, ".*neon.*"): GYP_CONFIG += arm_fpu=\"$$MFPU\" arm_neon=1
else:!lessThan(MARMV, 7): GYP_CONFIG += arm_neon=0 arm_neon_optional=1
else: GYP_CONFIG += arm_fpu=\"$$MFPU\" arm_neon=0 arm_neon_optional=0
} else {