From 074e136444ef90114031d825064887f2f8e67630 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sun, 29 Mar 2015 08:37:23 -0500
Subject: use separate dirs for soft-float/hard-float toolchains

---
 mk/build.mk |  1 +
 mk/vars.mk  | 14 ++++++--------
 2 files changed, 7 insertions(+), 8 deletions(-)

(limited to 'mk')

diff --git a/mk/build.mk b/mk/build.mk
index 96740e3e8..fa3db75f7 100644
--- a/mk/build.mk
+++ b/mk/build.mk
@@ -185,6 +185,7 @@ ifeq ($(ADK_TARGET_PACKAGE_OPKG),y)
 endif
 
 ${STAGING_TARGET_DIR} ${STAGING_TARGET_DIR}/etc ${STAGING_HOST_DIR}:
+	echo ${STAGING_TARGET_DIR}
 	@mkdir -p ${STAGING_TARGET_DIR}/{bin,etc,lib,usr/bin,usr/include,usr/lib/pkgconfig} \
 		${STAGING_HOST_DIR}/{usr/bin,usr/lib,usr/include}
 	@for i in lib64 lib32 libx32;do \
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