toolchain: fix up lib64 symlink to lib before copying the initial prefix dir to avoid...

[lede-git/.git] / toolchain / gcc / initial / Makefile

diff --git a/toolchain/gcc/initial/Makefile b/toolchain/gcc/initial/Makefile
index f3f78b0b2f7f559292511c7ccc1552a720141c55..6b0536d83a2c9e99e2e473b720e3daa07a30d8d7 100644 (file)
--- a/toolchain/gcc/initial/Makefile
+++ b/toolchain/gcc/initial/Makefile
@@ -19,14 +19,19 @@ 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)/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)
+
+       $(CP) $(TOOLCHAIN_DIR)/initial/. $(TOOLCHAIN_DIR)/
 endef
 
 $(eval $(call HostBuild))