From ff97b2fbcf5e7f33231c2ddaa8e0037af5977121 Mon Sep 17 00:00:00 2001 From: Willy Tarreau Date: Mon, 16 Mar 2020 09:38:00 +0100 Subject: [PATCH] BUILD: makefile: fix regex syntax in ARM platform detection Commit d93e6ec ("BUILD: on ARM, must be linked to libatomic.") broke the build due to a missing backslash in front of the '#': Makefile:331: *** invalid syntax in conditional. Stop. Let's address this and make sure we only pick relevant lines (and not possibly empty lines). (cherry picked from commit 67b095e797a156ae27b7b52f6ccf57171717dd16) Signed-off-by: Willy Tarreau --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 7113d29..aafbf5e 100644 --- a/Makefile +++ b/Makefile @@ -329,7 +329,7 @@ ifeq ($(TARGET),linux-glibc) USE_CPU_AFFINITY USE_THREAD USE_EPOLL USE_FUTEX USE_LINUX_TPROXY \ USE_ACCEPT4 USE_LINUX_SPLICE USE_PRCTL USE_THREAD_DUMP USE_NS USE_TFO \ USE_GETADDRINFO) -ifneq ($(shell echo __arm__/__aarch64__ | $(CC) -E -xc - | grep -v '^#'),__arm__/__aarch64__) +ifneq ($(shell echo __arm__/__aarch64__ | $(CC) -E -xc - | grep -v '^[^\#]'),__arm__/__aarch64__) TARGET_LDFLAGS=-latomic endif endif -- 1.7.10.4