From f55c29e4c74353ef0795eb83911c708c6db90466 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Tue, 7 Feb 2017 10:33:10 +0100 Subject: build: remove libc version suffix from build/staging directories Our supported libcs are ABI compatible across version upgrades Signed-off-by: Felix Fietkau --- rules.mk | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'rules.mk') diff --git a/rules.mk b/rules.mk index f2b53d97a5..83d71671c4 100644 --- a/rules.mk +++ b/rules.mk @@ -120,10 +120,9 @@ BUILD_DIR_BASE:=$(TOPDIR)/build_dir ifeq ($(CONFIG_EXTERNAL_TOOLCHAIN),) GCCV:=$(call qstrip,$(CONFIG_GCC_VERSION)) LIBC:=$(call qstrip,$(CONFIG_LIBC)) - 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 - DIR_SUFFIX:=_$(LIBC)-$(LIBCV)$(if $(CONFIG_arm),_eabi) + DIR_SUFFIX:=_$(LIBC)$(if $(CONFIG_arm),_eabi) BIN_DIR:=$(BIN_DIR)$(if $(CONFIG_USE_MUSL),,-$(LIBC)) TARGET_DIR_NAME = target-$(ARCH)$(ARCH_SUFFIX)$(DIR_SUFFIX)$(if $(BUILD_SUFFIX),_$(BUILD_SUFFIX)) TOOLCHAIN_DIR_NAME = toolchain-$(ARCH)$(ARCH_SUFFIX)_gcc-$(GCCV)$(DIR_SUFFIX) -- cgit v1.2.3