From cc5b3e683ee091b29f6994cc42b2db4c9b90da3d Mon Sep 17 00:00:00 2001 From: John Crispin <john@openwrt.org> Date: Tue, 10 Apr 2012 10:55:55 +0000 Subject: [PATCH] Use build suffix on build_dir paths Adds BUILD_SUFFIX to STAGING_DIR Signed-off-by: Tathagata Das <tathagata@alumnux.com> SVN-Revision: 31233 --- rules.mk | 4 ++-- 1 file 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 -- GitLab