1*4882a593SmuzhiyunFrom e97a572d4aef099a961e43d528c0268e10d9f1e2 Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: Khem Raj <raj.khem@gmail.com> 3*4882a593SmuzhiyunDate: Tue, 10 Sep 2019 20:04:26 -0700 4*4882a593SmuzhiyunSubject: [PATCH] src: Do not reset FINAL_LIBS 5*4882a593Smuzhiyun 6*4882a593SmuzhiyunThis helps case where additional libraries are needed to be passed from 7*4882a593Smuzhiyunenvironment to get it going 8*4882a593Smuzhiyun 9*4882a593Smuzhiyune.g. -latomic is needed on clang/x86 to provide for 64bit atomics 10*4882a593Smuzhiyun 11*4882a593SmuzhiyunUpstream-Status: Pending 12*4882a593SmuzhiyunSigned-off-by: Khem Raj <raj.khem@gmail.com> 13*4882a593Smuzhiyun 14*4882a593Smuzhiyun--- 15*4882a593Smuzhiyun src/Makefile | 2 +- 16*4882a593Smuzhiyun 1 file changed, 1 insertion(+), 1 deletion(-) 17*4882a593Smuzhiyun 18*4882a593Smuzhiyundiff --git a/src/Makefile b/src/Makefile 19*4882a593Smuzhiyunindex ddabd44..5133884 100644 20*4882a593Smuzhiyun--- a/src/Makefile 21*4882a593Smuzhiyun+++ b/src/Makefile 22*4882a593Smuzhiyun@@ -118,7 +118,7 @@ endif 23*4882a593Smuzhiyun 24*4882a593Smuzhiyun FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) $(REDIS_CFLAGS) 25*4882a593Smuzhiyun FINAL_LDFLAGS=$(LDFLAGS) $(REDIS_LDFLAGS) $(DEBUG) 26*4882a593Smuzhiyun-FINAL_LIBS=-lm 27*4882a593Smuzhiyun+FINAL_LIBS+=-lm 28*4882a593Smuzhiyun DEBUG=-g -ggdb 29*4882a593Smuzhiyun 30*4882a593Smuzhiyun # Linux ARM32 needs -latomic at linking time 31