toolchain/musl: remove libgcc_initial hack

This reverts r15599 [0].

This was added to fix an uclibc rebuild issue, but since uclibc
isn't supported anymore [Fixes:] this can be removed.

[0] https://git.openwrt.org/?p=openwrt/svn-archive/archive.git;a=commitdiff;h=016a052efeee6bc2da3f501a8c66b5aea20350b4

Fixes: 63fb1752 "toolchain: remove uClibc-ng"
Signed-off-by: Andre Heider <a.heider@gmail.com>

diff --git a/toolchain/gcc/initial/Makefile b/toolchain/gcc/initial/Makefile
index 68a7ccd3c759778f42d3f96c1209cb028326bb50..102fc070ae0d78907e73c6e75e62fe27dbf939be 100644 (file)
--- a/toolchain/gcc/initial/Makefile
+++ b/toolchain/gcc/initial/Makefile
@@ -23,10 +23,6 @@ define Host/Install
                install-gcc \
                install-target-libgcc
 
-       ( cd $(TOOLCHAIN_DIR)/initial/lib/gcc/$(REAL_GNU_TARGET_NAME)/$(PKG_VERSION) ; \
-               cp libgcc.a libgcc_initial.a; \
-       )
-
        $(call FixupLibdir,$(TOOLCHAIN_DIR)/initial)
        $$(call file_copy,$(TOOLCHAIN_DIR)/initial/.,$(TOOLCHAIN_DIR)/)
 endef

diff --git a/toolchain/musl/Makefile b/toolchain/musl/Makefile
index 2b9312bcbf123c03cf8947c52044557e27377e79..d441e37684769a61c649f4740f850bfb59a497bc 100644 (file)
--- a/toolchain/musl/Makefile
+++ b/toolchain/musl/Makefile
@@ -9,7 +9,7 @@ HOST_BUILD_PARALLEL:=1
 
 MUSL_MAKEOPTS = -C $(HOST_BUILD_DIR) \
        DESTDIR="$(TOOLCHAIN_DIR)/" \
-       LIBCC="$(subst libgcc.a,libgcc_initial.a,$(shell $(TARGET_CC) -print-libgcc-file-name))"
+       LIBCC="$(shell $(TARGET_CC) -print-libgcc-file-name)"
 
 define Host/SetToolchainInfo
        $(SED) 's,^\(LIBC_TYPE\)=.*,\1=$(PKG_NAME),' $(TOOLCHAIN_DIR)/info.mk