From 074e136444ef90114031d825064887f2f8e67630 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 29 Mar 2015 08:37:23 -0500 Subject: use separate dirs for soft-float/hard-float toolchains --- mk/vars.mk | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'mk/vars.mk') diff --git a/mk/vars.mk b/mk/vars.mk index 4ad638164..4978c75ec 100644 --- a/mk/vars.mk +++ b/mk/vars.mk @@ -9,17 +9,15 @@ INSTALL_SCRIPT= install -m0755 MAKEFLAGS= $(EXTRA_MAKEFLAGS) BUILD_USER= $(shell id -un) BUILD_GROUP= $(shell id -gn) -ifeq ($(ADK_TARGET_ABI),) ADK_SUFFIX:= _${ADK_TARGET_SYSTEM}_${ADK_TARGET_LIBC}_${ADK_TARGET_CPU_ARCH} -ifeq ($(ADK_TARGET_WITH_MMU),) -ADK_SUFFIX:= _${ADK_TARGET_SYSTEM}_${ADK_TARGET_LIBC}_${ADK_TARGET_CPU_ARCH}_nommu +ifneq ($(ADK_TARGET_FLOAT),) +ADK_SUFFIX:= $(ADK_SUFFIX)_$(ADK_TARGET_FLOAT) endif -else -ifeq ($(ADK_TARGET_WITH_MMU),) -ADK_SUFFIX:= _${ADK_TARGET_SYSTEM}_${ADK_TARGET_LIBC}_${ADK_TARGET_CPU_ARCH}_${ADK_TARGET_ABI}_nommu -else -ADK_SUFFIX:= _${ADK_TARGET_SYSTEM}_${ADK_TARGET_LIBC}_${ADK_TARGET_CPU_ARCH}_${ADK_TARGET_ABI} +ifneq ($(ADK_TARGET_ABI),) +ADK_SUFFIX:= $(ADK_SUFFIX)_$(ADK_TARGET_ABI) endif +ifeq ($(ADK_TARGET_WITH_MMU),) +ADK_SUFFIX:= $(ADK_SUFFIX)_nommu endif # some global dirs -- cgit v1.2.3