commit 875def873a0ddaf4fdab47ee4e516a91e6a34dc7
author Willy Tarreau <w@1wt.eu> Mon Mar 16 09:38:00 2020 +0100
committer Willy Tarreau <w@1wt.eu> Tue Mar 31 18:56:25 2020 +0200
tree 5bf90bd3ba7e0c7dba59ae6bd060d1c2b2efff54
parent 89114c18c777aaea4e453f123c0fa564dd757ae1

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 <w@1wt.eu>
(cherry picked from commit ff97b2fbcf5e7f33231c2ddaa8e0037af5977121)
Signed-off-by: Willy Tarreau <w@1wt.eu>

Makefile

diff --git a/Makefile b/Makefile
index c97971d..fadfe37 100644
--- a/Makefile
+++ b/Makefile
@@ -324,7 +324,7 @@
     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