summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAbdoulaye Walsimou Gaye <awg@embtoolkit.org>2013-02-10 21:45:13 +0100
committerAbdoulaye Walsimou Gaye <awg@embtoolkit.org>2013-02-10 21:45:13 +0100
commitb838ea30eadd01fdb6a96cfb6c1a97b81b92806f (patch)
tree9cc4f41047fcfd53ad1fce8ccd6ab9629283a800
parente067345ebb0bbda5227835f6bc01e8ea9bc4f520 (diff)
downloadembtoolkit-b838ea30eadd01fdb6a96cfb6c1a97b81b92806f.tar.gz
embtoolkit-b838ea30eadd01fdb6a96cfb6c1a97b81b92806f.tar.bz2
embtoolkit-b838ea30eadd01fdb6a96cfb6c1a97b81b92806f.tar.xz
Toolchain: libc++.so: directly link with libcxxrt_pic.a
Signed-off-by: Abdoulaye Walsimou Gaye <awg@embtoolkit.org>
-rw-r--r--mk/libc++/libc++/Makefile5
1 files changed, 3 insertions, 2 deletions
diff --git a/mk/libc++/libc++/Makefile b/mk/libc++/libc++/Makefile
index eec2f8f..98f7e45 100644
--- a/mk/libc++/libc++/Makefile
+++ b/mk/libc++/libc++/Makefile
@@ -52,7 +52,8 @@ override CFLAGS := $(CFLAGS) -I$(rootsrc)/include
override CFLAGS += -DLIBCXXRT -DNO_CATGETS_SUPPORT
override CXXFLAGS := $(CXXFLAGS) $(CFLAGS) -nostdinc++ -std=c++0x
-LDADD := -lcxxrt -lpthread -lrt -ldl -lc
+LDADD := $(shell $(CC) --print-file-name=libcxxrt_pic.a)
+LDADD += -lpthread -lrt -ldl -lc
ARADD := $(shell $(CC) --print-file-name=libcxxrt.a)
ARADD += $(shell $(CC) --print-file-name=libpthread.a)
@@ -95,7 +96,7 @@ install: all
$(Q)true
$(SHAREDLIB_NAME): $(SOBJS)
- $(Q)$(CC) $(CFLAGS) $(LDFLAGS) -o $@ \
+ $(Q)$(CC) $(LDFLAGS) -o $@ \
-Wl,-soname,$(SHAREDLIB_SONAME) $(SOBJS) $(LDADD)
$(Q)ln -fs $(SHAREDLIB_NAME) $(SHAREDLIB_LINK)