gitolite/buildrootschalter
gitolite/buildrootschalter
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

toolchain: revert r25193 (Change binary toolchain configuration)

Browse Source 
As discussed on the list.
This commit is contained in:
Peter Korsgaard 2009-02-04 13:42:40 +00:00
parent 93df57668f
commit 16a5a68947
4 changed files with 2 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
toolchain/Config.in
View File

@ -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

5
toolchain/external-toolchain/Config.in.2
View File

@ -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"

1
toolchain/external-toolchain/ext-tool.mk
View File

@ -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)

18
toolchain/gcc/gcc-uclibc-4.x.mk
View File

@ -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