francis.wang
4c86c082a2
Combine poky (Yocto scarthgap), meta-openembedded (scarthgap), and meta-openwrt into a single repository. Components: - poky/ Yocto core framework (BitBake + OE-Core) - meta-openembedded/ Community layers (meta-oe, meta-python, meta-networking) - meta-openwrt/ OpenWrt customization layer - setup-env.sh One-click build environment setup - README.md Project documentation
31 lines
861 B
Diff
31 lines
861 B
Diff
From 225f45d5fbeaa8998fac983fcb78d7912d6d6dd3 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 b8e0d44..3a68fa6 100644
|
|
--- a/src/Makefile
|
|
+++ b/src/Makefile
|
|
@@ -122,7 +122,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
|