[git commit] librt: Refine LIBS
Bernhard Reutner-Fischer
rep.dot.nop at gmail.com
Tue Apr 14 21:58:41 UTC 2015
commit: http://git.uclibc.org/uClibc/commit/?id=efc26521e8c8cda6430efe9a8ed1b73896b655b5
branch: http://git.uclibc.org/uClibc/commit/?id=refs/heads/master
Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop at gmail.com>
---
librt/Makefile.in | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/librt/Makefile.in b/librt/Makefile.in
index 15ee23e..4e81764 100644
--- a/librt/Makefile.in
+++ b/librt/Makefile.in
@@ -13,7 +13,8 @@ LDFLAGS-$(UCLIBC_FORMAT_DSBT_ELF)-librt.so := -Wl,--dsbt-index=9
LDFLAGS-librt.so := $(LDFLAGS)
LIBS-librt.so := $(LIBS)
ifeq ($(UCLIBC_HAS_THREADS_NATIVE),y)
-LIBS-librt.so += $(top_builddir)lib/libdl.so $(top_builddir)lib/libpthread.so
+LIBS-librt.so += $(top_builddir)lib/libpthread.so \
+ $(CC_FLAG_ASNEEDED) $(top_builddir)lib/libdl.so $(CC_FLAG_NO_ASNEEDED)
endif
librt_FULL_NAME := librt-$(VERSION).so
@@ -21,8 +22,6 @@ librt_FULL_NAME := librt-$(VERSION).so
librt_DIR := $(top_srcdir)librt
librt_OUT := $(top_builddir)librt
-ifeq ($(UCLIBC_HAS_REALTIME),y)
-
librt_SRC := $(notdir $(wildcard $(librt_DIR)/*.c))
librt_filter_SRC :=
ifeq ($(UCLIBC_HAS_THREADS_NATIVE),y)
@@ -45,7 +44,6 @@ librt_filter_SRC += $(if $(UCLIBC_HAS_ADVANCED_REALTIME),, \
librt_filter_SRC += $(if $(UCLIBC_HAS_STUBS),,rt_stubs.c)
librt_SRC := $(filter-out $(librt_filter_SRC),$(librt_SRC))
-
librt_OBJ := $(patsubst %.c,$(librt_OUT)/%.o,$(librt_SRC))
librt_OBJ += $(patsubst $(librt_DIR)/%.S,$(librt_OUT)/%.o,$(librt_SSRC))
@@ -59,6 +57,7 @@ librt-a-y += $(librt_OBJ)
endif
librt-so-y += $(librt_OBJ:.o=.oS)
+ifeq ($(UCLIBC_HAS_REALTIME),y)
lib-a-y += $(top_builddir)lib/librt.a
lib-so-y += $(top_builddir)lib/librt.so
endif
More information about the uClibc-cvs
mailing list