From 00fa581bc6acc3158b3008019e81802a5d70418c Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sun, 2 Mar 2014 15:22:50 +0100
Subject: remove REAL_GNU_TARGET_NAME, it is a relict from buildroot days, I do
 not know why this is required. the names are not unique between arch with
 different abi

---
 toolchain/glibc/Makefile.inc | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'toolchain/glibc')

diff --git a/toolchain/glibc/Makefile.inc b/toolchain/glibc/Makefile.inc
index e28405643..3c1a3167d 100644
--- a/toolchain/glibc/Makefile.inc
+++ b/toolchain/glibc/Makefile.inc
@@ -7,7 +7,7 @@ PKG_RELEASE:=		1
 PKG_MD5SUM:=		5374d29864b583622b62bfc6b8429418
 PKG_SITES:=		${MASTER_SITE_GNU:=glibc/}
 GLIBC_CONFOPTS:=	--build=$(GNU_HOST_NAME) \
-			--host=$(REAL_GNU_TARGET_NAME) \
+			--host=$(GNU_TARGET_NAME) \
 			--with-headers=$(STAGING_TARGET_DIR)/usr/include \
 			--disable-sanity-checks \
 			--disable-nls \
@@ -23,10 +23,10 @@ GLIBC_CONFOPTS:=	--build=$(GNU_HOST_NAME) \
 GLIBC_ENV:=             PATH='${TARGET_PATH}' \
                         BUILD_CC=${CC_FOR_BUILD} \
                         CFLAGS="$(TARGET_CFLAGS_LIBC)" \
-                        CC=${REAL_GNU_TARGET_NAME}-gcc \
-                        CXX=${REAL_GNU_TARGET_NAME}-g++ \
-                        AR=${REAL_GNU_TARGET_NAME}-ar \
-                        RANLIB=${REAL_GNU_TARGET_NAME}-ranlib \
+                        CC=${GNU_TARGET_NAME}-gcc \
+                        CXX=${GNU_TARGET_NAME}-g++ \
+                        AR=${GNU_TARGET_NAME}-ar \
+                        RANLIB=${GNU_TARGET_NAME}-ranlib \
                         libc_cv_forced_unwind=yes \
 			libc_cv_cc_with_libunwind=yes \
                         libc_cv_c_cleanup=yes \
-- 
cgit v1.2.3


From beb47ef07ddcd99d751088c588bc8135f6aae7ce Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Mon, 3 Mar 2014 07:41:20 +0100
Subject: only strip toolchain and target dirs for ADK_TOOLCHAIN

---
 toolchain/glibc/Makefile | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'toolchain/glibc')

diff --git a/toolchain/glibc/Makefile b/toolchain/glibc/Makefile
index 00bd67cbc..41987bada 100644
--- a/toolchain/glibc/Makefile
+++ b/toolchain/glibc/Makefile
@@ -73,8 +73,11 @@ $(WRKBUILD)/.fixup:
 	-find $(STAGING_TARGET_DIR) -type f -name \*_pic\* -delete
 	rm -rf $(STAGING_TARGET_DIR)/usr/share/locale $(STAGING_TARGET_DIR)/usr/share/i18n
 	rm -rf $(STAGING_TARGET_DIR)/usr/lib/gconv
-	PATH="$(TARGET_PATH)" debug='' prefix='${TARGET_CROSS}' ${BASH} ${SCRIPT_DIR}/rstrip.sh $(STAGING_TARGET_DIR)
-	debug='' prefix=' ' ${BASH} ${SCRIPT_DIR}/rstrip.sh $(STAGING_HOST_DIR)/bin $(STAGING_HOST_DIR)/$(GNU_TARGET_NAME)/
+ifeq ($(ADK_TOOLCHAIN),y)
+	# strip target libs and host tools for toolchain builds
+	PATH="$(TARGET_PATH)" debug='0' prefix='${TARGET_CROSS}' ${BASH} ${SCRIPT_DIR}/rstrip.sh $(STAGING_TARGET_DIR)
+	debug='0' prefix=' ' ${BASH} ${SCRIPT_DIR}/rstrip.sh $(STAGING_HOST_DIR)/bin $(STAGING_HOST_DIR)/$(GNU_TARGET_NAME)/
+endif
 	touch $@
 
 include ${TOPDIR}/mk/toolchain.mk
-- 
cgit v1.2.3