aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Crispin <blogic@openwrt.org>2012-04-10 10:55:55 +0000
committerJohn Crispin <blogic@openwrt.org>2012-04-10 10:55:55 +0000
commit45879534fd1d5e3722406b2b647a9caec7c5f72c (patch)
treecdf0cd10dc105983d8747dc825199f84a32bce25
parentaccb414b593333109c6464988e6f8df1a5736042 (diff)
downloadupstream-45879534fd1d5e3722406b2b647a9caec7c5f72c.tar.gz
upstream-45879534fd1d5e3722406b2b647a9caec7c5f72c.tar.bz2
upstream-45879534fd1d5e3722406b2b647a9caec7c5f72c.zip
[include] Use build suffix on build_dir paths
Adds BUILD_SUFFIX to STAGING_DIR Signed-off-by: Tathagata Das <tathagata@alumnux.com> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31233 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--rules.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/rules.mk b/rules.mk
index 6684c93c17..f6e748c429 100644
--- a/rules.mk
+++ b/rules.mk
@@ -82,7 +82,7 @@ ifeq ($(CONFIG_EXTERNAL_TOOLCHAIN),)
GNU_TARGET_NAME=$(OPTIMIZE_FOR_CPU)-openwrt-linux
DIR_SUFFIX:=_$(LIBC)-$(LIBCV)$(if $(CONFIG_arm),_eabi)
BUILD_DIR:=$(BUILD_DIR_BASE)/target-$(ARCH)$(ARCH_SUFFIX)$(DIR_SUFFIX)$(if $(BUILD_SUFFIX),_$(BUILD_SUFFIX))
- STAGING_DIR:=$(TOPDIR)/staging_dir/target-$(ARCH)$(ARCH_SUFFIX)$(DIR_SUFFIX)
+ STAGING_DIR:=$(TOPDIR)/staging_dir/target-$(ARCH)$(ARCH_SUFFIX)$(DIR_SUFFIX)$(if $(BUILD_SUFFIX),_$(BUILD_SUFFIX))
BUILD_DIR_TOOLCHAIN:=$(BUILD_DIR_BASE)/toolchain-$(ARCH)$(ARCH_SUFFIX)_gcc-$(GCCV)$(DIR_SUFFIX)
TOOLCHAIN_DIR:=$(TOPDIR)/staging_dir/toolchain-$(ARCH)$(ARCH_SUFFIX)_gcc-$(GCCV)$(DIR_SUFFIX)
PACKAGE_DIR:=$(BIN_DIR)/packages
@@ -94,7 +94,7 @@ else
endif
REAL_GNU_TARGET_NAME=$(GNU_TARGET_NAME)
BUILD_DIR:=$(BUILD_DIR_BASE)/target-$(GNU_TARGET_NAME)$(if $(BUILD_SUFFIX),_$(BUILD_SUFFIX))
- STAGING_DIR:=$(TOPDIR)/staging_dir/target-$(GNU_TARGET_NAME)
+ STAGING_DIR:=$(TOPDIR)/staging_dir/target-$(GNU_TARGET_NAME)$(if $(BUILD_SUFFIX),_$(BUILD_SUFFIX))
BUILD_DIR_TOOLCHAIN:=$(BUILD_DIR_BASE)/toolchain-$(GNU_TARGET_NAME)
TOOLCHAIN_DIR:=$(TOPDIR)/staging_dir/toolchain-$(GNU_TARGET_NAME)
PACKAGE_DIR:=$(BIN_DIR)/packages