zlib: only enable NEON optimizations on eligible targets

[openwrt/openwrt.git] / package / libs / zlib / Makefile

diff --git a/package/libs/zlib/Makefile b/package/libs/zlib/Makefile
index 94977b05896a14d401777f75a8d78d9fd5dbb5c5..a7c61f7dd0df39e545587f7c006bc1d45dae8df2 100644 (file)
--- a/package/libs/zlib/Makefile
+++ b/package/libs/zlib/Makefile
@@ -60,10 +60,8 @@ ifeq ($(CONFIG_ZLIB_OPTIMIZE_SPEED),y)
        TARGET_CFLAGS := $(filter-out -O%,$(TARGET_CFLAGS)) -O3
 endif
 
-ifneq ($(findstring neon,$(CONFIG_TARGET_OPTIMIZATION)),)
-       CMAKE_OPTIONS += \
-               -DARMv8=ON
-endif
+CMAKE_OPTIONS += \
+       -DARMv8=$$$$(echo -e '\#ifdef __ARM_NEON__\nON\n\#else\nOFF\n\#endif' | $$(TARGET_CC) $$(TARGET_CFLAGS) -x c -E - | grep -xE 'ON|OFF')
 
 define Build/InstallDev
        mkdir -p $(1)/usr/include