diff options
| author | Nicolas Thill <nico@openwrt.org> | 2010-04-15 00:33:40 +0000 |
|---|---|---|
| committer | Nicolas Thill <nico@openwrt.org> | 2010-04-15 00:33:40 +0000 |
| commit | d3e5ab1f193c31a556fb830bf0d6c66508f37781 (patch) | |
| tree | 7b72ae8a9840880fb6050e49303d05a2ca26c7dc | |
| parent | d009c8ed974e3907073b7c81235b71535f880210 (diff) | |
| download | upstream-d3e5ab1f193c31a556fb830bf0d6c66508f37781.tar.gz upstream-d3e5ab1f193c31a556fb830bf0d6c66508f37781.tar.bz2 upstream-d3e5ab1f193c31a556fb830bf0d6c66508f37781.zip | |
target/toolchain: match toolchain directory name changes in r19885 & r20215 (closes: #7148 & #7162)
SVN-Revision: 20865
| -rw-r--r-- | target/toolchain/Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/target/toolchain/Makefile b/target/toolchain/Makefile index fa9405f6cc..1e0dec2dd1 100644 --- a/target/toolchain/Makefile +++ b/target/toolchain/Makefile @@ -16,7 +16,7 @@ override MAKEFLAGS= PKG_OS:=$(shell uname -s) PKG_CPU:=$(shell uname -m) -TOOLCHAIN_NAME:=OpenWrt-Toolchain-$(BOARD)-for-$(ARCH)-gcc-$(GCCV)_$(LIBC)-$(LIBCV) +TOOLCHAIN_NAME:=OpenWrt-Toolchain-$(BOARD)-for-$(ARCH)$(ARCH_SUFFIX)-gcc-$(GCCV)$(DIR_SUFFIX) TOOLCHAIN_BUILD_DIR:=$(BUILD_DIR)/$(TOOLCHAIN_NAME) EXCLUDE_DIRS:=*/ccache \ */stamp \ @@ -26,13 +26,13 @@ EXCLUDE_DIRS:=*/ccache \ all: compile -TOOLCHAIN_PREFIX:=$(TOOLCHAIN_BUILD_DIR)/toolchain-$(ARCH)_gcc-$(GCCV)_$(LIBC)-$(LIBCV) +TOOLCHAIN_PREFIX:=$(TOOLCHAIN_BUILD_DIR)/toolchain-$(ARCH)$(ARCH_SUFFIX)_gcc-$(GCCV)$(DIR_SUFFIX) $(BIN_DIR)/$(TOOLCHAIN_NAME).tar.bz2: clean mkdir -p $(TOOLCHAIN_BUILD_DIR) $(TAR) -cf - -C $(TOPDIR)/staging_dir/ \ $(foreach exclude,$(EXCLUDE_DIRS),--exclude="$(exclude)") \ - toolchain-$(ARCH)_gcc-$(GCCV)_$(LIBC)-$(LIBCV) | \ + toolchain-$(ARCH)$(ARCH_SUFFIX)_gcc-$(GCCV)$(DIR_SUFFIX) | \ $(TAR) -xf - -C $(TOOLCHAIN_BUILD_DIR) $(CP) $(TOPDIR)/LICENSE ./files/README.TOOLCHAIN \ |