diff options
| author | Abdoulaye Walsimou Gaye <awg@embtoolkit.org> | 2013-03-16 18:11:16 +0100 |
|---|---|---|
| committer | Abdoulaye Walsimou Gaye <awg@embtoolkit.org> | 2013-03-16 18:11:16 +0100 |
| commit | 441848971890e093ccbf6bdfecf8e3cb4664385d (patch) | |
| tree | d9e5e7420daecb3fc8375af8a6e51609ebf19e5b | |
| parent | 2202df7e61c66721fb0aec1319384a08ad5f2d0c (diff) | |
| download | embtoolkit-441848971890e093ccbf6bdfecf8e3cb4664385d.tar.gz embtoolkit-441848971890e093ccbf6bdfecf8e3cb4664385d.tar.bz2 embtoolkit-441848971890e093ccbf6bdfecf8e3cb4664385d.tar.xz | |
Toolchain: llvm/libc++: fix install of static library
Signed-off-by: Abdoulaye Walsimou Gaye <awg@embtoolkit.org>
| -rw-r--r-- | mk/libc++/libc++/Makefile | 48 |
1 files changed, 14 insertions, 34 deletions
diff --git a/mk/libc++/libc++/Makefile b/mk/libc++/libc++/Makefile index 98f7e45..b569623 100644 --- a/mk/libc++/libc++/Makefile +++ b/mk/libc++/libc++/Makefile @@ -30,7 +30,6 @@ LIBDIR ?= lib CXX_SRCS := $(wildcard $(rootsrc)/src/*.cpp) OBJS := $(patsubst %.cpp,%.o,$(CXX_SRCS)) -POBJS := $(patsubst %.o,%.po,$(OBJS)) SOBJS := $(patsubst %.o,%.So,$(OBJS)) __HEADERS := $(wildcard $(rootsrc)/include/*) @@ -45,27 +44,16 @@ SHAREDLIB_NAME := lib$(SHAREDLIB).so.1 SHAREDLIB_LINK := lib$(SHAREDLIB).so SHAREDLIB_SONAME := $(SHAREDLIB_NAME) -override LDFLAGS := $(LDFLAGS) -shared -override LDFLAGS += -Wl,--warn-shared-textrel -Wl,-x +override LDFLAGS := $(LDFLAGS) -shared -Wl,--warn-shared-textrel -Wl,-x -override CFLAGS := $(CFLAGS) -I$(rootsrc)/include -override CFLAGS += -DLIBCXXRT -DNO_CATGETS_SUPPORT override CXXFLAGS := $(CXXFLAGS) $(CFLAGS) -nostdinc++ -std=c++0x +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) -ARADD += $(shell $(CC) --print-file-name=libpthread.a) -ARADD += $(shell $(CC) --print-file-name=librt.a) - -ARADD_P := $(shell $(CC) --print-file-name=libcxxrt_p.a) -#ARADD_P += $(shell $(CC) --print-file-name=libpthread_p.a) -#ARADD_P += $(shell $(CC) --print-file-name=librt_p.a) - -ARADD_PIC := $(shell $(CC) --print-file-name=libcxxrt_pic.a) -#ARADD_PIC += $(shell $(CC) --print-file-name=libpthread.a) -#ARADD_PIC += $(shell $(CC) --print-file-name=librt.a) ARFLAGS := rvs @@ -83,12 +71,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)/$(LIBDIR)/ - cp lib$(LIB)_pic.a $(SYSROOT)/$(LIBDIR)/ - cp lib$(LIB)_p.a $(SYSROOT)/$(LIBDIR)/) + cp lib$(LIB).a $(SYSROOT)/$(LIBDIR)/) endef -all: lib$(LIB).a lib$(LIB)_p.a lib$(LIB)_pic.a $(SHAREDLIB_NAME) +all: lib$(LIB).a $(SHAREDLIB_NAME) $(Q)true install: all @@ -96,30 +82,24 @@ install: all $(Q)true $(SHAREDLIB_NAME): $(SOBJS) - $(Q)$(CC) $(LDFLAGS) -o $@ \ + $(Q)$(CC) $(LDFLAGS) -o $@ \ -Wl,-soname,$(SHAREDLIB_SONAME) $(SOBJS) $(LDADD) $(Q)ln -fs $(SHAREDLIB_NAME) $(SHAREDLIB_LINK) lib$(LIB).a: $(OBJS) - $(Q)$(AR) $(ARFLAGS) $@ $(OBJS) - -lib$(LIB)_p.a: $(POBJS) - $(Q)$(AR) $(ARFLAGS) $@ $(POBJS) - -lib$(LIB)_pic.a: $(SOBJS) - $(Q)$(AR) $(ARFLAGS) $@ $(SOBJS) + $(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 %.o: %.cpp - $(Q)$(CXX) $(CXXFLAGS) -c $< -o $@ - -%.po: %.cpp - $(Q)$(CXX) $(CXXFLAGS) -pg -c $< -o $@ + $(Q)$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c $< -o $@ %.So: %.cpp - $(Q)$(CXX) -fPIC -DPIC $(CXXFLAGS) -c $< -o $@ + $(Q)$(CXX) -fPIC $(CXXFLAGS) $(CPPFLAGS) -c $< -o $@ clean: - $(Q)rm -rf $(OBJS) $(SOBJS) $(POBJS) - $(Q)rm -rf lib$(LIB).a lib$(LIB)_p.a lib$(LIB)_pic.a + $(Q)rm -rf $(OBJS) $(SOBJS) lib$(LIB).a $(Q)rm -rf $(SHAREDLIB_NAME) $(SHAREDLIB_LINK) |