From 16a5a68947a7b7efd3bee6c7120afec166f2baeb Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Wed, 4 Feb 2009 13:42:40 +0000
Subject: toolchain: revert r25193 (Change binary toolchain configuration)

As discussed on the list.
---
 toolchain/Config.in                      |  4 +---
 toolchain/external-toolchain/Config.in.2 |  5 +----
 toolchain/external-toolchain/ext-tool.mk |  1 -
 toolchain/gcc/gcc-uclibc-4.x.mk          | 18 ------------------
 4 files changed, 2 insertions(+), 26 deletions(-)

diff --git a/toolchain/Config.in b/toolchain/Config.in
index f0f9f74ec..d66ce1d38 100644
--- a/toolchain/Config.in
+++ b/toolchain/Config.in
@@ -26,8 +26,6 @@ config BR2_TOOLCHAIN_SOURCE
 	default y if BR2_TOOLCHAIN_BUILDROOT || BR2_TOOLCHAIN_EXTERNAL_SOURCE
 	default n if BR2_TOOLCHAIN_EXTERNAL
 
-source "toolchain/external-toolchain/Config.in.2"
-
 source "target/device/Config.in.toolchain"
 
 source "toolchain/Config.in.1"
@@ -40,6 +38,6 @@ source "toolchain/gdb/Config.in"
 comment "Common Toolchain Options"
 
 source "toolchain/Config.in.2"
+source "toolchain/external-toolchain/Config.in.2"
 
 endmenu
-
diff --git a/toolchain/external-toolchain/Config.in.2 b/toolchain/external-toolchain/Config.in.2
index bf3f75dd4..489558c0f 100644
--- a/toolchain/external-toolchain/Config.in.2
+++ b/toolchain/external-toolchain/Config.in.2
@@ -3,12 +3,9 @@
 if BR2_TOOLCHAIN_EXTERNAL
 config BR2_TOOLCHAIN_EXTERNAL_PATH
 	string "External toolchain path"
-	default "$(GCCROOT)"
+	default "/path/to/staging_dir/usr"
 	help
 	  Path to where the external toolchain is installed.
-	  Either define GCCROOT in your environment
-	  or an absolute path like:
-	  "/path/to/staging_dir/usr"
 
 config BR2_TOOLCHAIN_EXTERNAL_PREFIX
 	string "External toolchain prefix"
diff --git a/toolchain/external-toolchain/ext-tool.mk b/toolchain/external-toolchain/ext-tool.mk
index 857dec3af..1c9197b95 100644
--- a/toolchain/external-toolchain/ext-tool.mk
+++ b/toolchain/external-toolchain/ext-tool.mk
@@ -60,4 +60,3 @@ $(TARGET_DIR)/lib/$(strip $(subst ",, $(BR2_TOOLCHAIN_EXTERNAL_LIB_C))):
 		$(call copy_toolchain_lib_root, $$libs, /lib, $(BR2_TOOLCHAIN_EXTERNAL_STRIP)); \
 	done
 	$(call copy_toolchain_sysroot)
-
diff --git a/toolchain/gcc/gcc-uclibc-4.x.mk b/toolchain/gcc/gcc-uclibc-4.x.mk
index fe1002f41..c4ef41a9d 100644
--- a/toolchain/gcc/gcc-uclibc-4.x.mk
+++ b/toolchain/gcc/gcc-uclibc-4.x.mk
@@ -498,23 +498,5 @@ gcc-status:
 	@echo GCC_PATCH_DIR=$(GCC_PATCH_DIR)
 	@echo GCC_SITE=$(GCC_SITE)
 
-GCCSCRIPT=$(ARCH)-uclibc-gcc-$(BR2_GCC_VERSION).sh
-
-gccscript:
-	@rm -f $(GCCSCRIPT)
-	@rm -f gcc.sh
-	@echo	"#!/bin/sh"						> $(GCCSCRIPT)
-	@echo	"# $(ARCH) cross compiler toolchain created $(DATE)"	>> $(GCCSCRIPT)
-	@echo	"# gcc-$(BR2_GCC_VERSION)"				>> $(GCCSCRIPT)
-	@echo	"# binutils-$(BR2_BINUTILS_VERSION)"			>> $(GCCSCRIPT)
-	@echo	"# uClibc-$(UCLIBC_VER)"				>> $(GCCSCRIPT)
-	@echo	"export	GCCROOT=$(BR2_STAGING_DIR)/usr"			>> $(GCCSCRIPT)
-	@echo	"export	PATH=\$$GCCROOT/bin:\$$PATH"			>> $(GCCSCRIPT)
-	@echo	"export	GCCPREFIX=$(ARCH)-linux"			>> $(GCCSCRIPT)
-	@echo	"export	CROSS_COMPILE=\$$GCCPREFIX-"			>> $(GCCSCRIPT)
-	@chmod	a+x $(GCCSCRIPT)
-	@ln	-s $(GCCSCRIPT) gcc.sh
-	@echo	"$(GCCSCRIPT) created"
-	@more	$(GCCSCRIPT)
 endif
 # gcc-4.x only
-- 
cgit v1.2.3