diff options
| author | Abdoulaye Walsimou Gaye <awg@embtoolkit.org> | 2013-01-06 20:24:31 +0100 |
|---|---|---|
| committer | Abdoulaye Walsimou Gaye <awg@embtoolkit.org> | 2013-01-06 20:24:31 +0100 |
| commit | 5e4d6ac61aba1267b8326ee9721b6f9267126d10 (patch) | |
| tree | b72f861310c73e958a3ab02c6e224c4ab2084ae5 | |
| parent | 269ebab3f03340a68c9c064ba2cd9842d481be33 (diff) | |
| download | embtoolkit-5e4d6ac61aba1267b8326ee9721b6f9267126d10.tar.gz embtoolkit-5e4d6ac61aba1267b8326ee9721b6f9267126d10.tar.bz2 embtoolkit-5e4d6ac61aba1267b8326ee9721b6f9267126d10.tar.xz | |
Toolchain: libcxxrt: only make available static library
Signed-off-by: Abdoulaye Walsimou Gaye <awg@embtoolkit.org>
| -rw-r--r-- | mk/libc++/libcxxrt/Makefile | 25 |
1 files changed, 7 insertions, 18 deletions
diff --git a/mk/libc++/libcxxrt/Makefile b/mk/libc++/libcxxrt/Makefile index 5b68712..9d64a7a 100644 --- a/mk/libc++/libcxxrt/Makefile +++ b/mk/libc++/libcxxrt/Makefile @@ -33,7 +33,7 @@ C_SRCS := $(filter-out $(__NO_C_SRCS),$(C_SRCS)) CXX_SRCS := $(wildcard $(rootsrc)/src/*.cc) -__HEADERS := cxxabi.h unwind.h unwind-arm.h unwind-itanium.h +__HEADERS := cxxabi.h unwind-arm.h unwind.h unwind-itanium.h HEADERS := $(addprefix $(rootsrc)/src/,$(__HEADERS)) OBJS := $(patsubst %.c,%.o,$(C_SRCS)) @@ -50,12 +50,9 @@ SHAREDLIB_SONAME := $(SHAREDLIB_NAME) CC ?= gcc CXX ?= g++ -override LDFLAGS := $(LDFLAGS) -override LDFLAGS += -Wl,--fatal-warnings -Wl,--warn-shared-textrel -override LDFLAGS += -shared -Wl,-x -LDADD := -ldl - ARFLAGS := rvs +ARADD := $(shell $(CC) --print-file-name=libgcc.a) +ARADD += $(shell $(CC) --print-file-name=libgcc_eh.a) override CFLAGS := $(CFLAGS) -I$(rootsrc)/src override CXXFLAGS := $(CXXFLAGS) $(CFLAGS) @@ -67,34 +64,27 @@ define __lib_install mkdir -p $(SYSROOT)/usr/include mkdir -p $(SYSROOT)/usr/include/c++ mkdir -p $(SYSROOT)/usr/include/c++/v1 - 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 $(HEADERS) $(SYSROOT)/usr/include/c++/v1/) endef -all: lib$(LIB).a lib$(LIB)_p.a lib$(LIB)_pic.a $(SHAREDLIB_NAME) +all: lib$(LIB).a lib$(LIB)_p.a lib$(LIB)_pic.a $(Q)true install: all $(Q)$(__lib_install) $(Q)true -$(SHAREDLIB_NAME): $(SOBJS) - $(Q)$(CC) $(CFLAGS) $(LDFLAGS) -o $@ \ - -Wl,-soname,$(SHAREDLIB_SONAME) $(SOBJS) $(LDADD) - $(Q)ln -fs $(SHAREDLIB_NAME) $(SHAREDLIB_LINK) - lib$(LIB).a: $(OBJS) - $(Q)$(AR) $(ARFLAGS) $@ $(OBJS) + $(Q)$(AR) $(ARFLAGS) $@ $(OBJS) $(ARADD) lib$(LIB)_p.a: $(POBJS) - $(Q)$(AR) $(ARFLAGS) $@ $(POBJS) + $(Q)$(AR) $(ARFLAGS) $@ $(POBJS) $(ARADD) lib$(LIB)_pic.a: $(SOBJS) - $(Q)$(AR) $(ARFLAGS) $@ $(SOBJS) + $(Q)$(AR) $(ARFLAGS) $@ $(SOBJS) $(ARADD) %.o: %.c $(Q)$(CC) $(CFLAGS) -c $< -o $@ @@ -117,5 +107,4 @@ lib$(LIB)_pic.a: $(SOBJS) clean: $(Q)rm -rf $(OBJS) $(SOBJS) $(POBJS) $(Q)rm -rf lib$(LIB).a lib$(LIB)_p.a lib$(LIB)_pic.a - $(Q)rm -rf $(SHAREDLIB_NAME) $(SHAREDLIB_LINK) |