build: add a variable for the name of the {build,staging}_dir/{target,toolchain}-* directories
Signed-off-by: Felix Fietkau <nbd@openwrt.org> SVN-Revision: 39857
This commit is contained in:
parent
3ed094e85a
commit
318052e03c
1 changed files with 10 additions and 10 deletions
20
rules.mk
20
rules.mk
|
@ -87,11 +87,8 @@ ifeq ($(CONFIG_EXTERNAL_TOOLCHAIN),)
|
||||||
GNU_TARGET_NAME=$(OPTIMIZE_FOR_CPU)-openwrt-linux
|
GNU_TARGET_NAME=$(OPTIMIZE_FOR_CPU)-openwrt-linux
|
||||||
DIR_SUFFIX:=_$(LIBC)-$(LIBCV)$(if $(CONFIG_arm),_eabi)
|
DIR_SUFFIX:=_$(LIBC)-$(LIBCV)$(if $(CONFIG_arm),_eabi)
|
||||||
BIN_DIR:=$(BIN_DIR)$(if $(CONFIG_USE_UCLIBC),,-$(LIBC))
|
BIN_DIR:=$(BIN_DIR)$(if $(CONFIG_USE_UCLIBC),,-$(LIBC))
|
||||||
BUILD_DIR:=$(BUILD_DIR_BASE)/target-$(ARCH)$(ARCH_SUFFIX)$(DIR_SUFFIX)$(if $(BUILD_SUFFIX),_$(BUILD_SUFFIX))
|
TARGET_DIR_NAME = target-$(ARCH)$(ARCH_SUFFIX)$(DIR_SUFFIX)$(if $(BUILD_SUFFIX),_$(BUILD_SUFFIX))
|
||||||
STAGING_DIR:=$(TOPDIR)/staging_dir/target-$(ARCH)$(ARCH_SUFFIX)$(DIR_SUFFIX)$(if $(BUILD_SUFFIX),_$(BUILD_SUFFIX))
|
TOOLCHAIN_DIR_NAME = toolchain-$(ARCH)$(ARCH_SUFFIX)_gcc-$(GCCV)$(DIR_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
|
|
||||||
else
|
else
|
||||||
ifeq ($(CONFIG_NATIVE_TOOLCHAIN),)
|
ifeq ($(CONFIG_NATIVE_TOOLCHAIN),)
|
||||||
GNU_TARGET_NAME=$(call qstrip,$(CONFIG_TARGET_NAME))
|
GNU_TARGET_NAME=$(call qstrip,$(CONFIG_TARGET_NAME))
|
||||||
|
@ -99,12 +96,15 @@ else
|
||||||
GNU_TARGET_NAME=$(shell gcc -dumpmachine)
|
GNU_TARGET_NAME=$(shell gcc -dumpmachine)
|
||||||
endif
|
endif
|
||||||
REAL_GNU_TARGET_NAME=$(GNU_TARGET_NAME)
|
REAL_GNU_TARGET_NAME=$(GNU_TARGET_NAME)
|
||||||
BUILD_DIR:=$(BUILD_DIR_BASE)/target-$(GNU_TARGET_NAME)$(if $(BUILD_SUFFIX),_$(BUILD_SUFFIX))
|
TARGET_DIR_NAME:=target-$(GNU_TARGET_NAME)$(if $(BUILD_SUFFIX),_$(BUILD_SUFFIX))
|
||||||
STAGING_DIR:=$(TOPDIR)/staging_dir/target-$(GNU_TARGET_NAME)$(if $(BUILD_SUFFIX),_$(BUILD_SUFFIX))
|
TOOLCHAIN_DIR_NAME:=toolchain-$(GNU_TARGET_NAME)
|
||||||
BUILD_DIR_TOOLCHAIN:=$(BUILD_DIR_BASE)/toolchain-$(GNU_TARGET_NAME)
|
|
||||||
TOOLCHAIN_DIR:=$(TOPDIR)/staging_dir/toolchain-$(GNU_TARGET_NAME)
|
|
||||||
PACKAGE_DIR:=$(BIN_DIR)/packages
|
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
PACKAGE_DIR:=$(BIN_DIR)/packages
|
||||||
|
BUILD_DIR:=$(BUILD_DIR_BASE)/$(TARGET_DIR_NAME)
|
||||||
|
STAGING_DIR:=$(TOPDIR)/staging_dir/$(TARGET_DIR_NAME)
|
||||||
|
BUILD_DIR_TOOLCHAIN:=$(BUILD_DIR_BASE)/$(TOOLCHAIN_DIR_NAME)
|
||||||
|
TOOLCHAIN_DIR:=$(TOPDIR)/staging_dir/$(TOOLCHAIN_DIR_NAME)
|
||||||
STAMP_DIR:=$(BUILD_DIR)/stamp
|
STAMP_DIR:=$(BUILD_DIR)/stamp
|
||||||
STAMP_DIR_HOST=$(BUILD_DIR_HOST)/stamp
|
STAMP_DIR_HOST=$(BUILD_DIR_HOST)/stamp
|
||||||
TARGET_ROOTFS_DIR?=$(if $(call qstrip,$(CONFIG_TARGET_ROOTFS_DIR)),$(call qstrip,$(CONFIG_TARGET_ROOTFS_DIR)),$(BUILD_DIR))
|
TARGET_ROOTFS_DIR?=$(if $(call qstrip,$(CONFIG_TARGET_ROOTFS_DIR)),$(call qstrip,$(CONFIG_TARGET_ROOTFS_DIR)),$(BUILD_DIR))
|
||||||
|
|
Loading…
Reference in a new issue