use a DIR_SUFFIX variable to hold libc/version and use it in build/staging dir names
SVN-Revision: 19884
This commit is contained in:
parent
ff2e61fed8
commit
c0f8b43b17
1 changed files with 5 additions and 4 deletions
9
rules.mk
9
rules.mk
|
@ -57,10 +57,11 @@ ifeq ($(CONFIG_EXTERNAL_TOOLCHAIN),)
|
||||||
LIBCV:=$(call qstrip,$(CONFIG_LIBC_VERSION))
|
LIBCV:=$(call qstrip,$(CONFIG_LIBC_VERSION))
|
||||||
REAL_GNU_TARGET_NAME=$(OPTIMIZE_FOR_CPU)-openwrt-linux$(if $(TARGET_SUFFIX),-$(TARGET_SUFFIX))
|
REAL_GNU_TARGET_NAME=$(OPTIMIZE_FOR_CPU)-openwrt-linux$(if $(TARGET_SUFFIX),-$(TARGET_SUFFIX))
|
||||||
GNU_TARGET_NAME=$(OPTIMIZE_FOR_CPU)-openwrt-linux
|
GNU_TARGET_NAME=$(OPTIMIZE_FOR_CPU)-openwrt-linux
|
||||||
BUILD_DIR:=$(BUILD_DIR_BASE)/target-$(ARCH)_$(LIBC)-$(LIBCV)$(if $(BUILD_SUFFIX),_$(BUILD_SUFFIX))
|
DIR_SUFFIX:=_$(LIBC)-$(LIBCV)
|
||||||
STAGING_DIR:=$(TOPDIR)/staging_dir/target-$(ARCH)_$(LIBC)-$(LIBCV)
|
BUILD_DIR:=$(BUILD_DIR_BASE)/target-$(ARCH)$(DIR_SUFFIX)$(if $(BUILD_SUFFIX),_$(BUILD_SUFFIX))
|
||||||
BUILD_DIR_TOOLCHAIN:=$(BUILD_DIR_BASE)/toolchain-$(ARCH)_gcc-$(GCCV)_$(LIBC)-$(LIBCV)
|
STAGING_DIR:=$(TOPDIR)/staging_dir/target-$(ARCH)$(DIR_SUFFIX)
|
||||||
TOOLCHAIN_DIR:=$(TOPDIR)/staging_dir/toolchain-$(ARCH)_gcc-$(GCCV)_$(LIBC)-$(LIBCV)
|
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
|
PACKAGE_DIR:=$(BIN_DIR)/packages
|
||||||
else
|
else
|
||||||
ifeq ($(CONFIG_NATIVE_TOOLCHAIN),)
|
ifeq ($(CONFIG_NATIVE_TOOLCHAIN),)
|
||||||
|
|
Loading…
Reference in a new issue