From b5931405fff42429ff01c6ef219a9a58c8194897 Mon Sep 17 00:00:00 2001 From: Dustin Collins Date: Wed, 11 Mar 2020 11:34:59 -0500 Subject: Fix Pi building needing -latomic, backport --- src/Makefile | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/Makefile b/src/Makefile index 2a6864929..4b2a31cc7 100644 --- a/src/Makefile +++ b/src/Makefile @@ -77,6 +77,15 @@ FINAL_LDFLAGS=$(LDFLAGS) $(REDIS_LDFLAGS) $(DEBUG) FINAL_LIBS=-lm DEBUG=-g -ggdb +# Linux ARM needs -latomic at linking time +ifneq (,$(filter aarch64 armv,$(uname_M))) + FINAL_LIBS+=-latomic +else +ifneq (,$(findstring armv,$(uname_M))) + FINAL_LIBS+=-latomic +endif +endif + ifeq ($(uname_S),SunOS) # SunOS ifneq ($(@@),32bit) -- cgit v1.2.1