toolchain/gcc: remove glibc libgcc_eh hack

[openwrt/openwrt.git] / toolchain / gcc / initial / Makefile

diff --git a/toolchain/gcc/initial/Makefile b/toolchain/gcc/initial/Makefile
index d1481e0a3605806ff036d1a522e6c6d09cd0ba82..68a7ccd3c759778f42d3f96c1209cb028326bb50 100644 (file)
--- a/toolchain/gcc/initial/Makefile
+++ b/toolchain/gcc/initial/Makefile
@@ -1,4 +1,5 @@
 GCC_VARIANT:=initial
+GCC_PREPARE=$(CONFIG_USE_MUSL)
 
 include ../common.mk
 
@@ -10,22 +11,19 @@ GCC_CONFIGURE += \
        --disable-threads \
 
 define Host/Compile
-       $(CP) $(BUILD_DIR_TOOLCHAIN)/linux-dev/* $(BUILD_DIR_TOOLCHAIN)/$(LIBC)-dev/
        +$(GCC_MAKE) $(HOST_JOBS) -C $(GCC_BUILD_DIR) \
                all-build-libiberty \
                all-gcc \
-               $(if $(GCC_BUILD_TARGET_LIBGCC),all-target-libgcc)
+               all-target-libgcc
 endef
 
 define Host/Install
-       $(GCC_MAKE) -C $(GCC_BUILD_DIR) \
+       +$(GCC_MAKE) $(HOST_JOBS) -C $(GCC_BUILD_DIR) \
                prefix="$(TOOLCHAIN_DIR)/initial" \
                install-gcc \
-               $(if $(GCC_BUILD_TARGET_LIBGCC),install-target-libgcc)
+               install-target-libgcc
 
-       # XXX: glibc insists on linking against libgcc_eh
        ( cd $(TOOLCHAIN_DIR)/initial/lib/gcc/$(REAL_GNU_TARGET_NAME)/$(PKG_VERSION) ; \
-               [ -e libgcc_eh.a ] || ln -sf libgcc.a libgcc_eh.a ; \
                cp libgcc.a libgcc_initial.a; \
        )