[backfire] toolchain: fix paths after relocation from usr/ (#10876)

[openwrt-10.03/.git] / target / sdk / Makefile

diff --git a/target/sdk/Makefile b/target/sdk/Makefile
index 0d4bfcd6ef2ad4027c393a1e71d9e845ab7bdab1..737404108dcfb1e8a0f7fe5a6f572b8314a7f58a 100644 (file)
--- a/target/sdk/Makefile
+++ b/target/sdk/Makefile
@@ -29,14 +29,18 @@ all: compile
 $(BIN_DIR)/$(SDK_NAME).tar.bz2: clean
        mkdir -p $(SDK_BUILD_DIR)/dl $(SDK_BUILD_DIR)/package
        $(CP) $(INCLUDE_DIR) $(SCRIPT_DIR) $(TOPDIR)/docs $(SDK_BUILD_DIR)/
-       $(TAR) -cf - -C $(TOPDIR) $(foreach exclude,$(EXCLUDE_DIRS),--exclude="$(exclude)") --exclude="staging_dir/$(ARCH)" staging_dir/host staging_dir/target-$(ARCH)$(ARCH_SUFFIX)_$(LIBC)-$(LIBCV) staging_dir/toolchain-$(ARCH)$(ARCH_SUFFIX)_gcc-$(GCCV)_$(LIBC)-$(LIBCV) | \
+       $(TAR) -cf - -C $(TOPDIR) \
+               $(foreach exclude,$(EXCLUDE_DIRS),--exclude="$(exclude)") \
+               --exclude="staging_dir/$(ARCH)" \
+               staging_dir/host staging_dir/target-$(ARCH)$(ARCH_SUFFIX)_$(LIBC)-$(LIBCV)$(if $(CONFIG_arm),_eabi) \
+               staging_dir/toolchain-$(ARCH)$(ARCH_SUFFIX)_gcc-$(GCCV)_$(LIBC)-$(LIBCV)$(if $(CONFIG_arm),_eabi) | \
                $(TAR) -xf - -C $(SDK_BUILD_DIR)
        mkdir -p $(SDK_BUILD_DIR)/target/linux
        $(CP) $(GENERIC_PLATFORM_DIR) $(PLATFORM_DIR) $(SDK_BUILD_DIR)/target/linux/
        rm -rf \
                $(SDK_BUILD_DIR)/target/linux/*/files \
                $(SDK_BUILD_DIR)/target/linux/*/patches
-       $(CP) \
+       $(CP) -L \
                $(TOPDIR)/LICENSE \
                $(TOPDIR)/rules.mk \
                $(TOPDIR)/.config \