* [Buildroot] svn commit: trunk/buildroot/toolchain: external-toolchain gcc
@ 2009-01-31 20:50 ulf at uclibc.org
2009-02-02 12:20 ` Peter Korsgaard
0 siblings, 1 reply; 3+ messages in thread
From: ulf at uclibc.org @ 2009-01-31 20:50 UTC (permalink / raw)
To: buildroot
Author: ulf
Date: 2009-01-31 20:49:59 +0000 (Sat, 31 Jan 2009)
New Revision: 25193
Log:
Change binary toolchain configuration, so
that the options become visible just below
the config, instead of at bottom of screen
Create a more useful default as toolchain path.
Allow generation of a script which sets up
paths to a binary toolchain generated by buildroot.
Modified:
trunk/buildroot/toolchain/Config.in
trunk/buildroot/toolchain/external-toolchain/Config.in.2
trunk/buildroot/toolchain/external-toolchain/ext-tool.mk
trunk/buildroot/toolchain/gcc/gcc-uclibc-4.x.mk
Changeset:
Modified: trunk/buildroot/toolchain/Config.in
===================================================================
--- trunk/buildroot/toolchain/Config.in 2009-01-31 20:44:04 UTC (rev 25192)
+++ trunk/buildroot/toolchain/Config.in 2009-01-31 20:49:59 UTC (rev 25193)
@@ -26,6 +26,8 @@
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"
@@ -38,6 +40,6 @@
comment "Common Toolchain Options"
source "toolchain/Config.in.2"
-source "toolchain/external-toolchain/Config.in.2"
endmenu
+
Modified: trunk/buildroot/toolchain/external-toolchain/Config.in.2
===================================================================
--- trunk/buildroot/toolchain/external-toolchain/Config.in.2 2009-01-31 20:44:04 UTC (rev 25192)
+++ trunk/buildroot/toolchain/external-toolchain/Config.in.2 2009-01-31 20:49:59 UTC (rev 25193)
@@ -3,9 +3,12 @@
if BR2_TOOLCHAIN_EXTERNAL
config BR2_TOOLCHAIN_EXTERNAL_PATH
string "External toolchain path"
- default "/path/to/staging_dir/usr"
+ default "$(GCCROOT)"
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"
Modified: trunk/buildroot/toolchain/external-toolchain/ext-tool.mk
===================================================================
--- trunk/buildroot/toolchain/external-toolchain/ext-tool.mk 2009-01-31 20:44:04 UTC (rev 25192)
+++ trunk/buildroot/toolchain/external-toolchain/ext-tool.mk 2009-01-31 20:49:59 UTC (rev 25193)
@@ -60,3 +60,4 @@
$(call copy_toolchain_lib_root, $$libs, /lib, $(BR2_TOOLCHAIN_EXTERNAL_STRIP)); \
done
$(call copy_toolchain_sysroot)
+
Modified: trunk/buildroot/toolchain/gcc/gcc-uclibc-4.x.mk
===================================================================
--- trunk/buildroot/toolchain/gcc/gcc-uclibc-4.x.mk 2009-01-31 20:44:04 UTC (rev 25192)
+++ trunk/buildroot/toolchain/gcc/gcc-uclibc-4.x.mk 2009-01-31 20:49:59 UTC (rev 25193)
@@ -498,5 +498,23 @@
@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
^ permalink raw reply [flat|nested] 3+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/toolchain: external-toolchain gcc
2009-01-31 20:50 [Buildroot] svn commit: trunk/buildroot/toolchain: external-toolchain gcc ulf at uclibc.org
@ 2009-02-02 12:20 ` Peter Korsgaard
0 siblings, 0 replies; 3+ messages in thread
From: Peter Korsgaard @ 2009-02-02 12:20 UTC (permalink / raw)
To: buildroot
>>>>> "ulf" == ulf <ulf@uclibc.org> writes:
ulf> Author: ulf
ulf> Date: 2009-01-31 20:49:59 +0000 (Sat, 31 Jan 2009)
ulf> New Revision: 25193
ulf> Log:
ulf> Change binary toolchain configuration, so
ulf> that the options become visible just below
ulf> the config, instead of at bottom of screen
ulf> Create a more useful default as toolchain path.
ulf> Allow generation of a script which sets up
ulf> paths to a binary toolchain generated by buildroot.
What bug does this fix? Please DON'T add any new features to svn now.
ulf> Modified: trunk/buildroot/toolchain/external-toolchain/Config.in.2
ulf> ===================================================================
ulf> --- trunk/buildroot/toolchain/external-toolchain/Config.in.2 2009-01-31 20:44:04 UTC (rev 25192)
ulf> +++ trunk/buildroot/toolchain/external-toolchain/Config.in.2 2009-01-31 20:49:59 UTC (rev 25193)
ulf> @@ -3,9 +3,12 @@
ulf> if BR2_TOOLCHAIN_EXTERNAL
ulf> config BR2_TOOLCHAIN_EXTERNAL_PATH
ulf> string "External toolchain path"
ulf> - default "/path/to/staging_dir/usr"
ulf> + default "$(GCCROOT)"
ulf> help
ulf> Path to where the external toolchain is installed.
ulf> + Either define GCCROOT in your environment
ulf> + or an absolute path like:
ulf> + "/path/to/staging_dir/usr"
NACK. Let's not add any more magic environment variables (and
certainly not when they are not prefixed with BUILDROOT_).
ulf> config BR2_TOOLCHAIN_EXTERNAL_PREFIX
ulf> string "External toolchain prefix"
ulf> --- trunk/buildroot/toolchain/external-toolchain/ext-tool.mk 2009-01-31 20:44:04 UTC (rev 25192)
ulf> +++ trunk/buildroot/toolchain/external-toolchain/ext-tool.mk 2009-01-31 20:49:59 UTC (rev 25193)
ulf> @@ -60,3 +60,4 @@
ulf> $(call copy_toolchain_lib_root, $$libs, /lib, $(BR2_TOOLCHAIN_EXTERNAL_STRIP)); \
ulf> done
ulf> $(call copy_toolchain_sysroot)
ulf> +
Why?
ulf> Modified: trunk/buildroot/toolchain/gcc/gcc-uclibc-4.x.mk
ulf> ===================================================================
ulf> --- trunk/buildroot/toolchain/gcc/gcc-uclibc-4.x.mk 2009-01-31 20:44:04 UTC (rev 25192)
ulf> +++ trunk/buildroot/toolchain/gcc/gcc-uclibc-4.x.mk 2009-01-31 20:49:59 UTC (rev 25193)
ulf> @@ -498,5 +498,23 @@
ulf> @echo GCC_PATCH_DIR=$(GCC_PATCH_DIR)
ulf> @echo GCC_SITE=$(GCC_SITE)
ulf> +GCCSCRIPT=$(ARCH)-uclibc-gcc-$(BR2_GCC_VERSION).sh
ulf> +
ulf> +gccscript:
ulf> + @rm -f $(GCCSCRIPT)
ulf> + @rm -f gcc.sh
ulf> + @echo "#!/bin/sh" > $(GCCSCRIPT)
ulf> + @echo "# $(ARCH) cross compiler toolchain created $(DATE)" >> $(GCCSCRIPT)
ulf> + @echo "# gcc-$(BR2_GCC_VERSION)" >> $(GCCSCRIPT)
ulf> + @echo "# binutils-$(BR2_BINUTILS_VERSION)" >> $(GCCSCRIPT)
ulf> + @echo "# uClibc-$(UCLIBC_VER)" >> $(GCCSCRIPT)
ulf> + @echo "export GCCROOT=$(BR2_STAGING_DIR)/usr" >> $(GCCSCRIPT)
ulf> + @echo "export PATH=\$$GCCROOT/bin:\$$PATH" >> $(GCCSCRIPT)
ulf> + @echo "export GCCPREFIX=$(ARCH)-linux" >> $(GCCSCRIPT)
ulf> + @echo "export CROSS_COMPILE=\$$GCCPREFIX-" >> $(GCCSCRIPT)
ulf> + @chmod a+x $(GCCSCRIPT)
ulf> + @ln -s $(GCCSCRIPT) gcc.sh
ulf> + @echo "$(GCCSCRIPT) created"
ulf> + @more $(GCCSCRIPT)
And this neither.
Please revert.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 3+ messages in thread
* [Buildroot] svn commit: trunk/buildroot/toolchain: external-toolchain gcc
@ 2009-02-04 13:42 jacmet at uclibc.org
0 siblings, 0 replies; 3+ messages in thread
From: jacmet at uclibc.org @ 2009-02-04 13:42 UTC (permalink / raw)
To: buildroot
Author: jacmet
Date: 2009-02-04 13:42:40 +0000 (Wed, 04 Feb 2009)
New Revision: 25237
Log:
toolchain: revert r25193 (Change binary toolchain configuration)
As discussed on the list.
Modified:
trunk/buildroot/toolchain/Config.in
trunk/buildroot/toolchain/external-toolchain/Config.in.2
trunk/buildroot/toolchain/external-toolchain/ext-tool.mk
trunk/buildroot/toolchain/gcc/gcc-uclibc-4.x.mk
Changeset:
Modified: trunk/buildroot/toolchain/Config.in
===================================================================
--- trunk/buildroot/toolchain/Config.in 2009-02-04 12:57:21 UTC (rev 25236)
+++ trunk/buildroot/toolchain/Config.in 2009-02-04 13:42:40 UTC (rev 25237)
@@ -26,8 +26,6 @@
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 @@
comment "Common Toolchain Options"
source "toolchain/Config.in.2"
+source "toolchain/external-toolchain/Config.in.2"
endmenu
-
Modified: trunk/buildroot/toolchain/external-toolchain/Config.in.2
===================================================================
--- trunk/buildroot/toolchain/external-toolchain/Config.in.2 2009-02-04 12:57:21 UTC (rev 25236)
+++ trunk/buildroot/toolchain/external-toolchain/Config.in.2 2009-02-04 13:42:40 UTC (rev 25237)
@@ -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"
Modified: trunk/buildroot/toolchain/external-toolchain/ext-tool.mk
===================================================================
--- trunk/buildroot/toolchain/external-toolchain/ext-tool.mk 2009-02-04 12:57:21 UTC (rev 25236)
+++ trunk/buildroot/toolchain/external-toolchain/ext-tool.mk 2009-02-04 13:42:40 UTC (rev 25237)
@@ -60,4 +60,3 @@
$(call copy_toolchain_lib_root, $$libs, /lib, $(BR2_TOOLCHAIN_EXTERNAL_STRIP)); \
done
$(call copy_toolchain_sysroot)
-
Modified: trunk/buildroot/toolchain/gcc/gcc-uclibc-4.x.mk
===================================================================
--- trunk/buildroot/toolchain/gcc/gcc-uclibc-4.x.mk 2009-02-04 12:57:21 UTC (rev 25236)
+++ trunk/buildroot/toolchain/gcc/gcc-uclibc-4.x.mk 2009-02-04 13:42:40 UTC (rev 25237)
@@ -498,23 +498,5 @@
@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
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2009-02-04 13:42 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-01-31 20:50 [Buildroot] svn commit: trunk/buildroot/toolchain: external-toolchain gcc ulf at uclibc.org
2009-02-02 12:20 ` Peter Korsgaard
-- strict thread matches above, loose matches on Subject: below --
2009-02-04 13:42 jacmet at uclibc.org
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox