From mboxrd@z Thu Jan 1 00:00:00 1970 From: Peter Korsgaard Date: Mon, 02 Feb 2009 13:20:09 +0100 Subject: [Buildroot] svn commit: trunk/buildroot/toolchain: external-toolchain gcc In-Reply-To: <20090131205000.AC6B47621A@busybox.osuosl.org> (ulf@uclibc.org's message of "Sat\, 31 Jan 2009 20\:50\:00 +0000 \(UTC\)") References: <20090131205000.AC6B47621A@busybox.osuosl.org> Message-ID: <87k589ghdy.fsf@macbook.be.48ers.dk> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: buildroot@busybox.net >>>>> "ulf" == ulf 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