31 lines
861 B
Diff
31 lines
861 B
Diff
|
From e97a572d4aef099a961e43d528c0268e10d9f1e2 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Khem Raj <raj.khem@gmail.com>
|
||
|
|
Date: Tue, 10 Sep 2019 20:04:26 -0700
|
||
|
|
Subject: [PATCH] src: Do not reset FINAL_LIBS
|
||
|
|
|
||
|
|
This helps case where additional libraries are needed to be passed from
|
||
|
|
environment to get it going
|
||
|
|
|
||
|
|
e.g. -latomic is needed on clang/x86 to provide for 64bit atomics
|
||
|
|
|
||
|
|
Upstream-Status: Pending
|
||
|
|
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||
|
|
|
||
|
|
---
|
||
|
|
src/Makefile | 2 +-
|
||
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/src/Makefile b/src/Makefile
|
||
|
|
index ddabd44..5133884 100644
|
||
|
|
--- a/src/Makefile
|
||
|
|
+++ b/src/Makefile
|
||
|
|
@@ -118,7 +118,7 @@ endif
|
||
|
|
|
||
|
|
FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) $(REDIS_CFLAGS)
|
||
|
|
FINAL_LDFLAGS=$(LDFLAGS) $(REDIS_LDFLAGS) $(DEBUG)
|
||
|
|
-FINAL_LIBS=-lm
|
||
|
|
+FINAL_LIBS+=-lm
|
||
|
|
DEBUG=-g -ggdb
|
||
|
|
|
||
|
|
# Linux ARM32 needs -latomic at linking time
|