summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYossi Gottlieb <yossigo@gmail.com>2021-04-26 18:43:57 +0300
committerOran Agra <oran@redislabs.com>2021-05-03 22:57:00 +0300
commit8cfa37fc21d5dfacbafc37b56443512a60925104 (patch)
tree8a8197d7b3ff3316aa839d83f87e3992a655af96
parent16c53085f761d7b87de2021fc591e19ea7d899fd (diff)
downloadredis-8cfa37fc21d5dfacbafc37b56443512a60925104.tar.gz
Remove redundant -latomic on arm64. (#8867)
(cherry picked from commit ebfbb091096b6f36cf82e9f6e6583b10fd5b5acb)
-rw-r--r--src/Makefile6
1 files changed, 1 insertions, 5 deletions
diff --git a/src/Makefile b/src/Makefile
index 28d50da02..62e37cb48 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -93,14 +93,10 @@ 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
+# Linux ARM32 needs -latomic at linking time
ifneq (,$(findstring armv,$(uname_M)))
FINAL_LIBS+=-latomic
endif
-endif
ifeq ($(uname_S),SunOS)
# SunOS