From 66563bdab0c7acf3cd61dc6cfcca36275951d084 Mon Sep 17 00:00:00 2001 From: Mike Pall Date: Wed, 31 Mar 2021 17:06:27 +0200 Subject: [PATCH] Fix build with busybox grep. Reported by ymph. --- src/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Makefile b/src/Makefile index ca4afeab..fdf04b6e 100644 --- a/src/Makefile +++ b/src/Makefile @@ -335,7 +335,7 @@ ifeq (iOS,$(TARGET_SYS)) else ifeq (,$(findstring LJ_NO_UNWIND 1,$(TARGET_TESTARCH))) # Find out whether the target toolchain always generates unwind tables. - TARGET_TESTUNWIND=$(shell exec 2>/dev/null; echo 'extern void b(void);int a(void){b();return 0;}' | $(TARGET_CC) -c -x c - -o tmpunwind.o && grep -qU -e eh_frame -e __unwind_info tmpunwind.o && echo E; rm -f tmpunwind.o) + TARGET_TESTUNWIND=$(shell exec 2>/dev/null; echo 'extern void b(void);int a(void){b();return 0;}' | $(TARGET_CC) -c -x c - -o tmpunwind.o && { grep -qa -e eh_frame -e __unwind_info tmpunwind.o || grep -qU -e eh_frame -e __unwind_info tmpunwind.o; } && echo E; rm -f tmpunwind.o) ifneq (,$(findstring E,$(TARGET_TESTUNWIND))) TARGET_XCFLAGS+= -DLUAJIT_UNWIND_EXTERNAL endif