| Andrew Geissler | 7e0e3c0 | 2022-02-25 20:34:39 +0000 | [diff] [blame] | 1 | From e97a572d4aef099a961e43d528c0268e10d9f1e2 Mon Sep 17 00:00:00 2001 | 
|  | 2 | From: Khem Raj <raj.khem@gmail.com> | 
|  | 3 | Date: Tue, 10 Sep 2019 20:04:26 -0700 | 
|  | 4 | Subject: [PATCH] src: Do not reset FINAL_LIBS | 
|  | 5 |  | 
|  | 6 | This helps case where additional libraries are needed to be passed from | 
|  | 7 | environment to get it going | 
|  | 8 |  | 
|  | 9 | e.g. -latomic is needed on clang/x86 to provide for 64bit atomics | 
|  | 10 |  | 
|  | 11 | Upstream-Status: Pending | 
|  | 12 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 
|  | 13 |  | 
|  | 14 | --- | 
|  | 15 | src/Makefile | 2 +- | 
|  | 16 | 1 file changed, 1 insertion(+), 1 deletion(-) | 
|  | 17 |  | 
|  | 18 | diff --git a/src/Makefile b/src/Makefile | 
|  | 19 | index ddabd44..5133884 100644 | 
|  | 20 | --- a/src/Makefile | 
|  | 21 | +++ b/src/Makefile | 
|  | 22 | @@ -118,7 +118,7 @@ endif | 
|  | 23 |  | 
|  | 24 | FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) $(REDIS_CFLAGS) | 
|  | 25 | FINAL_LDFLAGS=$(LDFLAGS) $(REDIS_LDFLAGS) $(DEBUG) | 
|  | 26 | -FINAL_LIBS=-lm | 
|  | 27 | +FINAL_LIBS+=-lm | 
|  | 28 | DEBUG=-g -ggdb | 
|  | 29 |  | 
|  | 30 | # Linux ARM32 needs -latomic at linking time |