toolchain: revert r25193 (Change binary toolchain configuration)

As discussed on the list.

diff --git a/toolchain/Config.in b/toolchain/Config.in
index f0f9f74ecdbebd585d5b3c53929c5290d1cb6d74..d66ce1d38a82531e200f35b8914a2a5cf2df0b86 100644 (file)
--- 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 bf3f75dd4da219ab1416c191d53cd7542ca14dee..489558c0f6785ca019d94b14e7d0d8e78cbe95c4 100644 (file)
--- 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 857dec3af596d88bec3504f58ec56456cfd5dc76..1c9197b95f7f27edf0a1950465139271db2ea256 100644 (file)
--- 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 fe1002f41ef3c5e63cab3a3458343396da6ffd76..c4ef41a9dd987b7590b9fd065a660063f25fa4a5 100644 (file)
--- 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