From 634f5da8c988a5e83edfb5053260ea110bce337d Mon Sep 17 00:00:00 2001
From: wangzhengquan <wangzhengquan85@126.com>
Date: 星期一, 20 七月 2020 18:28:20 +0800
Subject: [PATCH] 解决冲突

---
 queue/Makefile |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/queue/Makefile b/queue/Makefile
index 14b1e08..3c8a4e2 100644
--- a/queue/Makefile
+++ b/queue/Makefile
@@ -41,8 +41,7 @@
 #dynamic lib
 $(DLIBSQUEUE): $(SOURCES)
 	rm -f *.o
-	$(CC) -fPIC -shared $(CFLAGS) $(LDFLAGS) $^ -o $@ 
-	#$(CC) -fPIC -shared $(CFLAGS) $(LDFLAGS)  -o $@ $^ -Wl,--whole-archive $(ROOT)/lib/libusgcommon.a -Wl,--no-whole-archive 
+	$(CC) -fPIC -shared $(CFLAGS) $^ -o $@ $(LDFLAGS) $(LDLIBS)
 
 
 #PREFIX is environment variable, but if it is not set, then set default value

--
Gitblit v1.8.0