From 4d384d28e44138c7619c0ab68b95cac21eeafbbf Mon Sep 17 00:00:00 2001 From: Andre Heider Date: Thu, 9 Feb 2023 11:06:31 +0100 Subject: [PATCH] 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 --- toolchain/gcc/initial/Makefile | 4 ---- toolchain/musl/Makefile | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/toolchain/gcc/initial/Makefile b/toolchain/gcc/initial/Makefile index 68a7ccd3c7..102fc070ae 100644 --- 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 2b9312bcbf..d441e37684 100644 --- 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