aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicolas Thill <nico@openwrt.org>2010-02-27 18:14:24 +0000
committerNicolas Thill <nico@openwrt.org>2010-02-27 18:14:24 +0000
commitc0f8b43b177135b62c9107e4366ba5086e055403 (patch)
tree636571dfd90627fe2952aced180a395e192231dd
parentff2e61fed8909769827be24eabc29bea964fdd1b (diff)
downloadupstream-c0f8b43b177135b62c9107e4366ba5086e055403.tar.gz
upstream-c0f8b43b177135b62c9107e4366ba5086e055403.tar.bz2
upstream-c0f8b43b177135b62c9107e4366ba5086e055403.zip
use a DIR_SUFFIX variable to hold libc/version and use it in build/staging dir names
SVN-Revision: 19884
-rw-r--r--rules.mk9
1 files changed, 5 insertions, 4 deletions
diff --git a/rules.mk b/rules.mk
index 47db7f62d2..ee439860f8 100644
--- a/rules.mk
+++ b/rules.mk
@@ -57,10 +57,11 @@ ifeq ($(CONFIG_EXTERNAL_TOOLCHAIN),)
LIBCV:=$(call qstrip,$(CONFIG_LIBC_VERSION))
REAL_GNU_TARGET_NAME=$(OPTIMIZE_FOR_CPU)-openwrt-linux$(if $(TARGET_SUFFIX),-$(TARGET_SUFFIX))
GNU_TARGET_NAME=$(OPTIMIZE_FOR_CPU)-openwrt-linux
- BUILD_DIR:=$(BUILD_DIR_BASE)/target-$(ARCH)_$(LIBC)-$(LIBCV)$(if $(BUILD_SUFFIX),_$(BUILD_SUFFIX))
- STAGING_DIR:=$(TOPDIR)/staging_dir/target-$(ARCH)_$(LIBC)-$(LIBCV)
- BUILD_DIR_TOOLCHAIN:=$(BUILD_DIR_BASE)/toolchain-$(ARCH)_gcc-$(GCCV)_$(LIBC)-$(LIBCV)
- TOOLCHAIN_DIR:=$(TOPDIR)/staging_dir/toolchain-$(ARCH)_gcc-$(GCCV)_$(LIBC)-$(LIBCV)
+ DIR_SUFFIX:=_$(LIBC)-$(LIBCV)
+ BUILD_DIR:=$(BUILD_DIR_BASE)/target-$(ARCH)$(DIR_SUFFIX)$(if $(BUILD_SUFFIX),_$(BUILD_SUFFIX))
+ STAGING_DIR:=$(TOPDIR)/staging_dir/target-$(ARCH)$(DIR_SUFFIX)
+ BUILD_DIR_TOOLCHAIN:=$(BUILD_DIR_BASE)/toolchain-$(ARCH)_gcc-$(GCCV)$(DIR_SUFFIX)
+ TOOLCHAIN_DIR:=$(TOPDIR)/staging_dir/toolchain-$(ARCH)_gcc-$(GCCV)$(DIR_SUFFIX)
PACKAGE_DIR:=$(BIN_DIR)/packages
else
ifeq ($(CONFIG_NATIVE_TOOLCHAIN),)