Merge pull request redis#6975 from dustinmm80/add-arm-latomic-linking

Fix Pi building needing -latomic, 5.0 branch backport
huskar-t · Mar 12, 2020 · 2bea502 · 2bea502
2 parents fd44130 + b593140
commit 2bea502
Showing 1 changed file with 9 additions and 0 deletions.
diff --git 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)