From d0dfbaaeca88e681932375ae966498b607d78fb0 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Mon, 11 Dec 2017 11:34:10 +0100 Subject: [PATCH] toolchain/musl: export libc_so.a for mklibs Signed-off-by: Felix Fietkau --- toolchain/musl/Makefile | 1 + .../patches/310-build-shared-libc-a.patch | 23 +++++++++++++++++++ 2 files changed, 24 insertions(+) create mode 100644 toolchain/musl/patches/310-build-shared-libc-a.patch diff --git a/toolchain/musl/Makefile b/toolchain/musl/Makefile index 2b9312bcbf..8cb743c8cd 100644 --- a/toolchain/musl/Makefile +++ b/toolchain/musl/Makefile @@ -25,6 +25,7 @@ endef define Host/Install $(call Host/SetToolchainInfo) +$(MAKE) $(HOST_JOBS) $(MUSL_MAKEOPTS) DESTDIR="$(TOOLCHAIN_DIR)/" install + $(CP) $(HOST_BUILD_DIR)/lib/libc_so.a $(TOOLCHAIN_DIR)/lib/ $(CP) ./include $(TOOLCHAIN_DIR)/ endef diff --git a/toolchain/musl/patches/310-build-shared-libc-a.patch b/toolchain/musl/patches/310-build-shared-libc-a.patch new file mode 100644 index 0000000000..7f6e616e19 --- /dev/null +++ b/toolchain/musl/patches/310-build-shared-libc-a.patch @@ -0,0 +1,23 @@ +--- a/Makefile ++++ b/Makefile +@@ -66,7 +66,7 @@ CRT_LIBS = $(addprefix lib/,$(notdir $(C + STATIC_LIBS = lib/libc.a + SHARED_LIBS = lib/libc.so + TOOL_LIBS = lib/musl-gcc.specs +-ALL_LIBS = $(CRT_LIBS) $(STATIC_LIBS) $(SHARED_LIBS) $(EMPTY_LIBS) $(TOOL_LIBS) lib/libssp_nonshared.a ++ALL_LIBS = $(CRT_LIBS) $(STATIC_LIBS) $(SHARED_LIBS) $(EMPTY_LIBS) $(TOOL_LIBS) lib/libssp_nonshared.a lib/libc_so.a + ALL_TOOLS = obj/musl-gcc + + WRAPCC_GCC = gcc +@@ -168,6 +168,11 @@ lib/libc.so: $(LOBJS) $(LDSO_OBJS) + $(CC) $(CFLAGS_ALL) $(LDFLAGS_ALL) -nostdlib -shared \ + -Wl,-e,_dlstart -o $@ $(LOBJS) $(LDSO_OBJS) $(LIBCC) + ++lib/libc_so.a: $(LOBJS) $(LDSO_OBJS) ++ rm -f $@ ++ $(AR) rc $@ $(LOBJS) $(LDSO_OBJS) ++ $(RANLIB) $@ ++ + lib/libc.a: $(AOBJS) + rm -f $@ + $(AR) rc $@ $(AOBJS) -- 2.30.2