toolchain: use file_copy to install the initial gcc files

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

diff --git a/toolchain/gcc/initial/Makefile b/toolchain/gcc/initial/Makefile
index 8cc6b3be141bb6855434a17ef5bdb5212b645749..d1481e0a3605806ff036d1a522e6c6d09cd0ba82 100644 (file)
--- a/toolchain/gcc/initial/Makefile
+++ b/toolchain/gcc/initial/Makefile
@@ -4,14 +4,14 @@ include ../common.mk
 
 GCC_CONFIGURE += \
        --with-newlib \
-       --with-sysroot=$(BUILD_DIR_TOOLCHAIN)/$(LIBC)-dev \
+       --with-sysroot=$(TOOLCHAIN_DIR) \
        --enable-languages=c \
        --disable-shared \
        --disable-threads \
 
 define Host/Compile
        $(CP) $(BUILD_DIR_TOOLCHAIN)/linux-dev/* $(BUILD_DIR_TOOLCHAIN)/$(LIBC)-dev/
-       $(GCC_MAKE) -C $(GCC_BUILD_DIR) \
+       +$(GCC_MAKE) $(HOST_JOBS) -C $(GCC_BUILD_DIR) \
                all-build-libiberty \
                all-gcc \
                $(if $(GCC_BUILD_TARGET_LIBGCC),all-target-libgcc)
@@ -19,14 +19,18 @@ endef
 
 define Host/Install
        $(GCC_MAKE) -C $(GCC_BUILD_DIR) \
+               prefix="$(TOOLCHAIN_DIR)/initial" \
                install-gcc \
                $(if $(GCC_BUILD_TARGET_LIBGCC),install-target-libgcc)
 
        # XXX: glibc insists on linking against libgcc_eh
-       ( cd $(TOOLCHAIN_DIR)/usr/lib/gcc/$(REAL_GNU_TARGET_NAME)/$(PKG_VERSION) ; \
+       ( 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; \
        )
+
+       $(call FixupLibdir,$(TOOLCHAIN_DIR)/initial)
+       $$(call file_copy,$(TOOLCHAIN_DIR)/initial/.,$(TOOLCHAIN_DIR)/)
 endef
 
 $(eval $(call HostBuild))