[git commit master 1/1] librt: fix linking WRT pthreads

Bernhard Reutner-Fischer rep.dot.nop at gmail.com
Thu Jun 17 17:31:27 UTC 2010


commit: http://git.uclibc.org/uClibc/commit/?id=486fbd8d6695a874fb023571919d483629b4964f
branch: http://git.uclibc.org/uClibc/commit/?id=refs/heads/master

Linking order matters. Always did and still does today.
See how this makes the ugly and wrong hack to put pthread symbols into
librt _and_ linking librt against pthread moot?

Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop at gmail.com>
---
 librt/Makefile.in |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/librt/Makefile.in b/librt/Makefile.in
index d490af5..6eb508c 100644
--- a/librt/Makefile.in
+++ b/librt/Makefile.in
@@ -10,12 +10,11 @@ subdirs += librt
 CFLAGS-librt := -DNOT_IN_libc -DIS_IN_librt $(SSP_ALL_CFLAGS)
 
 LDFLAGS-librt.so := $(LDFLAGS)
+LIBS-librt.so := $(LIBS)
 ifeq ($(UCLIBC_HAS_THREADS_NATIVE),y)
-LDFLAGS-librt.so += $(top_builddir)lib/libdl.so $(top_builddir)lib/libpthread.so
+LIBS-librt.so += $(top_builddir)lib/libdl.so $(top_builddir)lib/libpthread.so
 endif
 
-LIBS-librt.so := $(LIBS)
-
 librt_FULL_NAME := librt-$(VERSION).so
 
 librt_DIR := $(top_srcdir)librt
-- 
1.7.1



More information about the uClibc-cvs mailing list