From: notaz <notasas@gmail.com>
Date: Fri, 7 Jul 2023 19:36:28 +0000 (+0300)
Subject: make: patch detection yet more
X-Git-Tag: r24l~327
X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2ea8a96c595c83914505970883d096bd55dcc75d;p=pcsx_rearmed.git

make: patch detection yet more

findstring could pick '#undef <something>'
---

diff --git a/Makefile.libretro b/Makefile.libretro
index cf8e0807..069290cc 100644
--- a/Makefile.libretro
+++ b/Makefile.libretro
@@ -49,12 +49,12 @@ EXTRA_LDFLAGS =
 # select some defaults
 ifneq (,$(findstring $(ARCH_DETECTED),arm aarch64))
 	DYNAREC = ari64
-ifneq ($(findstring __thumb__,$(shell $(CC) -E -dD $(CFLAGS) include/arm_features.h)),)
+ifneq (,$(shell $(CC) -E -dD $(CFLAGS) include/arm_features.h | grep 'define __thumb__'))
 	# must disable thumb as ari64 can't handle it
 	CFLAGS += -marm
 endif
-ifneq ($(findstring __ARM_NEON,$(shell $(CC) -E -dD $(CFLAGS) include/arm_features.h)),)
-       BUILTIN_GPU = neon
+ifneq (,$(shell $(CC) -E -dD $(CFLAGS) include/arm_features.h | grep 'HAVE_NEON32'))
+	BUILTIN_GPU = neon
 endif
 endif
 ifneq (,$(findstring $(ARCH_DETECTED),i686 x86_64 aarch64))