toolchain: revert r25193 (Change binary toolchain configuration)
As discussed on the list.
This commit is contained in:
parent
93df57668f
commit
16a5a68947
|
@ -26,8 +26,6 @@ config BR2_TOOLCHAIN_SOURCE
|
||||||
default y if BR2_TOOLCHAIN_BUILDROOT || BR2_TOOLCHAIN_EXTERNAL_SOURCE
|
default y if BR2_TOOLCHAIN_BUILDROOT || BR2_TOOLCHAIN_EXTERNAL_SOURCE
|
||||||
default n if BR2_TOOLCHAIN_EXTERNAL
|
default n if BR2_TOOLCHAIN_EXTERNAL
|
||||||
|
|
||||||
source "toolchain/external-toolchain/Config.in.2"
|
|
||||||
|
|
||||||
source "target/device/Config.in.toolchain"
|
source "target/device/Config.in.toolchain"
|
||||||
|
|
||||||
source "toolchain/Config.in.1"
|
source "toolchain/Config.in.1"
|
||||||
|
@ -40,6 +38,6 @@ source "toolchain/gdb/Config.in"
|
||||||
comment "Common Toolchain Options"
|
comment "Common Toolchain Options"
|
||||||
|
|
||||||
source "toolchain/Config.in.2"
|
source "toolchain/Config.in.2"
|
||||||
|
source "toolchain/external-toolchain/Config.in.2"
|
||||||
|
|
||||||
endmenu
|
endmenu
|
||||||
|
|
||||||
|
|
|
@ -3,12 +3,9 @@
|
||||||
if BR2_TOOLCHAIN_EXTERNAL
|
if BR2_TOOLCHAIN_EXTERNAL
|
||||||
config BR2_TOOLCHAIN_EXTERNAL_PATH
|
config BR2_TOOLCHAIN_EXTERNAL_PATH
|
||||||
string "External toolchain path"
|
string "External toolchain path"
|
||||||
default "$(GCCROOT)"
|
default "/path/to/staging_dir/usr"
|
||||||
help
|
help
|
||||||
Path to where the external toolchain is installed.
|
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
|
config BR2_TOOLCHAIN_EXTERNAL_PREFIX
|
||||||
string "External toolchain prefix"
|
string "External toolchain prefix"
|
||||||
|
|
|
@ -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)); \
|
$(call copy_toolchain_lib_root, $$libs, /lib, $(BR2_TOOLCHAIN_EXTERNAL_STRIP)); \
|
||||||
done
|
done
|
||||||
$(call copy_toolchain_sysroot)
|
$(call copy_toolchain_sysroot)
|
||||||
|
|
||||||
|
|
|
@ -498,23 +498,5 @@ gcc-status:
|
||||||
@echo GCC_PATCH_DIR=$(GCC_PATCH_DIR)
|
@echo GCC_PATCH_DIR=$(GCC_PATCH_DIR)
|
||||||
@echo GCC_SITE=$(GCC_SITE)
|
@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
|
endif
|
||||||
# gcc-4.x only
|
# gcc-4.x only
|
||||||
|
|
Loading…
Reference in a new issue