diff options
| author | Abdoulaye Walsimou Gaye <awg@embtoolkit.org> | 2013-03-17 10:27:42 +0100 |
|---|---|---|
| committer | Abdoulaye Walsimou Gaye <awg@embtoolkit.org> | 2013-03-17 10:27:42 +0100 |
| commit | 6044084aac2d182b24eb31e78362de3275dd5819 (patch) | |
| tree | 9131f51eb58063ce09937e7b45224df9d63afd71 /mk/libc++ | |
| parent | 9e7a7971f2a12a154954e4149b61704b878eb7af (diff) | |
| download | embtoolkit-6044084aac2d182b24eb31e78362de3275dd5819.tar.gz embtoolkit-6044084aac2d182b24eb31e78362de3275dd5819.tar.bz2 embtoolkit-6044084aac2d182b24eb31e78362de3275dd5819.tar.xz | |
Toolchain: llvm/libc++: remove static library hack merging libc++ and libcxxrt
Signed-off-by: Abdoulaye Walsimou Gaye <awg@embtoolkit.org>
Diffstat (limited to 'mk/libc++')
| -rw-r--r-- | mk/libc++/libc++/Makefile | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/mk/libc++/libc++/Makefile b/mk/libc++/libc++/Makefile index 4237bd3..3541ebf 100644 --- a/mk/libc++/libc++/Makefile +++ b/mk/libc++/libc++/Makefile @@ -46,15 +46,13 @@ SHAREDLIB_SONAME := $(SHAREDLIB_NAME) override LDFLAGS := $(LDFLAGS) -shared -Wl,--warn-shared-textrel -Wl,-x -override CXXFLAGS := $(CXXFLAGS) $(CFLAGS) -nostdinc++ -std=c++0x +override CXXFLAGS := $(CXXFLAGS) $(CFLAGS) -nostdinc++ -std=c++11 override CPPFLAGS := $(CPPFLAGS) -I$(rootsrc)/include override CPPFLAGS += -DLIBCXXRT -DNO_CATGETS_SUPPORT LDADD := $(shell $(CC) --print-file-name=libcxxrt_pic.a) LDADD += -lpthread -lrt -ldl -lc -ARADD := $(shell $(CC) --print-file-name=libcxxrt.a) - ARFLAGS := rvs define __lib_install @@ -71,10 +69,10 @@ define __lib_install mkdir -p $(SYSROOT)/$(LIBDIR) cp -d $(SHAREDLIB_NAME) $(SYSROOT)/$(LIBDIR)/ cp -d $(SHAREDLIB_LINK) $(SYSROOT)/$(LIBDIR)/ - cp lib$(LIB).a $(SYSROOT)/usr/$(LIBDIR)/) + cp lib$(LIB)_nonshared.a $(SYSROOT)/usr/$(LIBDIR)/) endef -all: lib$(LIB).a $(SHAREDLIB_NAME) +all: lib$(LIB)_nonshared.a $(SHAREDLIB_NAME) $(Q)true install: all @@ -86,12 +84,8 @@ $(SHAREDLIB_NAME): $(SOBJS) -Wl,-soname,$(SHAREDLIB_SONAME) $(SOBJS) $(LDADD) $(Q)ln -fs $(SHAREDLIB_NAME) $(SHAREDLIB_LINK) -lib$(LIB).a: $(OBJS) - $(Q)rm -rf libcxxrt-objs - $(Q)mkdir -p libcxxrt-objs - $(Q)cd libcxxrt-objs; $(AR) -x $(ARADD) - $(Q)$(AR) $(ARFLAGS) $@ $(OBJS) libcxxrt-objs/*.o - $(Q)rm -rf libcxxrt-objs +lib$(LIB)_nonshared.a: $(OBJS) + $(Q)$(AR) $(ARFLAGS) $@ $(OBJS) %.o: %.cpp $(Q)$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c $< -o $@ |