From: Florian Fainelli Date: Sun, 15 Jan 2017 04:04:38 +0000 (-0800) Subject: build: Suffix build directory with _$(LIBC) for external toolchains X-Git-Tag: v17.01.5~298 X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fopenwrt.git;a=commitdiff_plain;h=3387158e45b1c0e329617d265392974b121230e7 build: Suffix build directory with _$(LIBC) for external toolchains For external toolchain, we also know the type of C library used, and the toolchain triplet may not always be reflective of that, therefore make $(TARGET_DIR_NAME) suffixed with _$(LIBC). Signed-off-by: Florian Fainelli (cherry picked from commit 57657a72376000b5843367e627098f09fe9c3647) --- diff --git a/rules.mk b/rules.mk index d58f8d92d3..1ed80f11b8 100644 --- a/rules.mk +++ b/rules.mk @@ -124,7 +124,8 @@ else GNU_TARGET_NAME=$(shell gcc -dumpmachine) endif REAL_GNU_TARGET_NAME=$(GNU_TARGET_NAME) - TARGET_DIR_NAME:=target-$(GNU_TARGET_NAME)$(if $(BUILD_SUFFIX),_$(BUILD_SUFFIX)) + LIBC:=$(call qstrip,$(CONFIG_LIBC)) + TARGET_DIR_NAME:=target-$(GNU_TARGET_NAME)_$(LIBC)$(if $(BUILD_SUFFIX),_$(BUILD_SUFFIX)) TOOLCHAIN_DIR_NAME:=toolchain-$(GNU_TARGET_NAME) endif