Allow creating a script for external use of Buildroot toolchain

diff --git a/toolchain/Config.in b/toolchain/Config.in
index d66ce1d38a82531e200f35b8914a2a5cf2df0b86..b0eb85daca55e0fb9d01f12730504da521da4908 100644 (file)
--- a/toolchain/Config.in
+++ b/toolchain/Config.in
@@ -26,6 +26,8 @@ config BR2_TOOLCHAIN_SOURCE
        default y if BR2_TOOLCHAIN_BUILDROOT || BR2_TOOLCHAIN_EXTERNAL_SOURCE
        default n if BR2_TOOLCHAIN_EXTERNAL
 
+source "toolchain/export-toolchain/Config.in"
+
 source "target/device/Config.in.toolchain"
 
 source "toolchain/Config.in.1"

diff --git a/toolchain/Makefile.in b/toolchain/Makefile.in
index bdabde9adb2fb0f56e85b152d15f307ef1f80ed8..16f33f6bc45cced9a4131ab707f5593c09bdf8cd 100644 (file)
--- a/toolchain/Makefile.in
+++ b/toolchain/Makefile.in
@@ -47,3 +47,5 @@ CFLAGS_COMBINE = $(call cc-option,-combine,)
 # gcc has a bunch of needed stuff....
 include toolchain/gcc/Makefile.in
 
+include toolchain/export-toolchain/Makefile.in
+

diff --git a/toolchain/export-toolchain/Config.in b/toolchain/export-toolchain/Config.in
new file mode 100644 (file)
index 0000000..1de8dcb
--- /dev/null
+++ b/toolchain/export-toolchain/Config.in
@@ -0,0 +1,8 @@
+config BR2_EXPORT_TOOLCHAIN
+       bool "Create script exporting toolchain to home directory"
+       default n
+       help
+         This will generate a batchfile which, if run
+         will add the Buildroot toolchain to the user PATH
+         The file is called "$(ARCH)-uclibc-gcc-$(GCC_VERSION).sh"
+

diff --git a/toolchain/export-toolchain/Makefile.in b/toolchain/export-toolchain/Makefile.in
new file mode 100644 (file)
index 0000000..94ea134
--- /dev/null
+++ b/toolchain/export-toolchain/Makefile.in
@@ -0,0 +1,28 @@
+# This generates a script which exports the toolchain
+# using a shell script
+
+GCC_SCRIPT:=$(ARCH)-uclibc-gcc-$(GCC_VERSION).sh
+GCC_SCRIPT_TEMP:=$(BINARIES_DIR)/$(GCC_SCRIPT)
+
+~/$(GCC_SCRIPT): cross_compiler
+       @echo   "#!/bin/sh"                                             >       $(GCC_SCRIPT_TEMP)
+       @echo   "# $(ARCH) cross compiler toolchain created $(DATE)"    >>      $(GCC_SCRIPT_TEMP)
+       @echo   "# gcc-$(GCC_VERSION)"                                  >>      $(GCC_SCRIPT_TEMP)
+       @echo   "# binutils-$(BINUTILS_VERSION)"                        >>      $(GCC_SCRIPT_TEMP)
+       @echo   "# uClibc-$(UCLIBC_VERSION)"                            >>      $(GCC_SCRIPT_TEMP)
+       @echo   "export GCCROOT=$(STAGING_DIR)/usr"                     >>      $(GCC_SCRIPT_TEMP)
+       @echo   "export PATH=\$$PATH:\$$GCCROOT/bin"                    >>      $(GCC_SCRIPT_TEMP)
+       @echo   "export CROSS_COMPILE=$(REAL_GNU_TARGET_NAME)-"         >>      $(GCC_SCRIPT_TEMP)
+       @cp     $(GCC_SCRIPT_TEMP) ~/$(GCC_SCRIPT)
+       @cat    ~/$(GCC_SCRIPT)
+
+export-toolchain: ~/$(GCC_SCRIPT)
+
+export-toolchain-clean:
+       rm      -f ~/$(GCC_SCRIPT)
+       rm      -f $(GCC_SCRIPT_TEMP)
+
+ifeq ($(BR2_EXPORT_TOOLCHAIN),y)
+TARGETS+=export-toolchain
+endif
+

diff --git a/toolchain/uClibc/Config.in b/toolchain/uClibc/Config.in
index dbb961cff01eb537eb0ae6555aff2860c02e5fc7..3c809c108129e1f62ac7b75d95eb142aa9d667d2 100644 (file)
--- a/toolchain/uClibc/Config.in
+++ b/toolchain/uClibc/Config.in
@@ -27,6 +27,12 @@ choice
 
 endchoice
 
+config UCLIBC_VERSION
+       string
+       default "0.9.28.3"      if BR2_UCLIBC_VERSION_0_9_28_3
+       default "0.9.29"        if BR2_UCLIBC_VERSION_0_9_29
+       default "0.9.30"        if BR2_UCLIBC_VERSION_0_9_30
+       default "snapshot"      if BR2_UCLIBC_VERSION_SNAPSHOT
 
 config BR2_USE_UCLIBC_SNAPSHOT
        string "Date (yyyymmdd) of snapshot or 'snapshot' for latest"