summaryrefslogtreecommitdiff
path: root/target/toolchain
diff options
context:
space:
mode:
authornico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-04-15 00:33:40 +0000
committernico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-04-15 00:33:40 +0000
commit8848c0b71efa905cd50ef93b327a544e2e215ddf (patch)
tree2d13c2f48a7b0d64cac66f14e7fb8f55171b598a /target/toolchain
parentec0ade34a49ea93891f37eac53c306a4adbaadd7 (diff)
target/toolchain: match toolchain directory name changes in r19885 & r20215 (closes: #7148 & #7162)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@20865 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/toolchain')
-rw-r--r--target/toolchain/Makefile6
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 \