From 48e8603a9c3b5b2509511665cb58d3bde8dfdb65 Mon Sep 17 00:00:00 2001 From: Willy Tarreau Date: Wed, 18 Mar 2020 08:20:45 +0100 Subject: [PATCH] BUILD: makefile: fix expression again to detect ARM platform I messed up the fix in 67b095e ("BUILD: makefile: fix regex syntax in ARM platform detection"), I tried it by hand in the shell without "-v" but left it in the expression. It works on ARM because it only finds lines starting with '#' but on other platforms it insists for -latomic. --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 959d5b7..d5841a5 100644 --- a/Makefile +++ b/Makefile @@ -328,7 +328,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 USE_BACKTRACE) -ifneq ($(shell echo __arm__/__aarch64__ | $(CC) -E -xc - | grep -v '^[^\#]'),__arm__/__aarch64__) +ifneq ($(shell echo __arm__/__aarch64__ | $(CC) -E -xc - | grep '^[^\#]'),__arm__/__aarch64__) TARGET_LDFLAGS=-latomic endif endif -- 1.7.10.4