Commit d8fc1c0a authored by Bernhard Reutner-Fischer's avatar Bernhard Reutner-Fischer
Browse files

- remove one invariant in toolchain type selection.

parent b5879204

target/device/Toolchain.in

+2 −11
Original line number Diff line number Diff line 
if BR2_TOOLCHAIN_EXTERNAL_SOURCE

choice

	prompt "Source location:"

	default BR2_TOOLCHAIN_NORMAL		if!BR2_avr32

	default BR2_TOOLCHAIN_ATMEL_AVR32	if BR2_avr32

	depends on BR2_TOOLCHAIN_BUILDROOT

	help

	  Select whether to use the toolchain built by the buildroot

	  system or an external pre-built toolchain.



config BR2_TOOLCHAIN_NORMAL

	bool "Use default sources for toolchain"

	depends on !BR2_avr32

	help

	  Download vanilla binutils, gcc, uclibc and gdb from their 

	  main download locations, and apply patches from the

	  "toolchain/<package>" directores.

	  I.E: Do not download a prepatched vendor source suite.



config BR2_TOOLCHAIN_ATMEL_AVR32

	bool "Use prepatched source for AVR32 toolchain"

	depends on BR2_avr32
@@ -53,3 +43,4 @@ config BR2_VENDOR_GDB_RELEASE 
config BR2_VENDOR_PATCH_DIR

	string

	default "target/device/Atmel/toolchain/avr32" if BR2_TOOLCHAIN_ATMEL_AVR32

endif

toolchain/Config.in

+12 −3
Original line number Diff line number Diff line
@@ -3,16 +3,25 @@ choice 
	prompt "Toolchain type"

	default BR2_TOOLCHAIN_BUILDROOT

	help

	  Select whether to use the toolchain built by the buildroot

	  system or an external pre-built toolchain.

	  Select whether to use the toolchain provided by buildroot

	  or an external toolchain.



config BR2_TOOLCHAIN_BUILDROOT

	bool "Buildroot toolchain"

	depends on !BR2_avr32



config BR2_TOOLCHAIN_EXTERNAL

	bool "External toolchain"

	bool "External binary toolchain"



config BR2_TOOLCHAIN_EXTERNAL_SOURCE

	bool "External source toolchain"

endchoice



config BR2_TOOLCHAIN_SOURCE

	bool

	default y if !BR2_TOOLCHAIN_EXTERNAL

	default n if BR2_TOOLCHAIN_EXTERNAL



source "target/device/Toolchain.in"



source "toolchain/Config.in.2"

toolchain/binutils/binutils.mk

+2 −2
Original line number Diff line number Diff line
@@ -65,13 +65,13 @@ BINUTILS_TARGET_CONFIG_OPTIONS=--with-gmp="$(GMP_TARGET_DIR)" 
BINUTILS_TARGET_CONFIG_OPTIONS+=--with-mpfr="$(MPFR_TARGET_DIR)"

endif



ifeq ($(BR2_TOOLCHAIN_NORMAL),)

ifeq ($(BR2_TOOLCHAIN_SOURCE),)

BINUTILS_SITE:=$(VENDOR_SITE)

endif



BINUTILS_OFFICIAL_VERSION:=$(BINUTILS_VERSION)$(VENDOR_SUFFIX)$(VENDOR_BINUTILS_RELEASE)



ifeq ($(BR2_TOOLCHAIN_NORMAL),y)

ifeq ($(BR2_TOOLCHAIN_SOURCE),y)

BINUTILS_PATCH_DIR:=toolchain/binutils/$(BINUTILS_VERSION)

else

BINUTILS_PATCH_DIR:=$(VENDOR_PATCH_DIR)/binutils-$(BINUTILS_OFFICIAL_VERSION)

toolchain/external-toolchain/Config.in

+4 −3
Original line number Diff line number Diff line 
#



menu "External Toolchain Options"

	depends on BR2_TOOLCHAIN_EXTERNAL

if BR2_TOOLCHAIN_EXTERNAL

comment "External Toolchain Options"





config BR2_TOOLCHAIN_EXTERNAL_LIB_C

	string "The core C library from the external toolchain"
@@ -104,4 +105,4 @@ config BR2_TARGET_OPTIMIZATION 
	help

	  Optimizations to use when building for the target host.



endmenu
 
endif

toolchain/gcc/gcc-uclibc-3.x.mk

+2 −2
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ endif 




# redefine if using an external prepatched gcc source

ifeq ($(BR2_TOOLCHAIN_NORMAL),)

ifeq ($(BR2_TOOLCHAIN_SOURCE),)

GCC_SITE:=$(VENDOR_SITE)

GCC_OFFICIAL_VER:=$(GCC_VERSION)$(VENDOR_SUFFIX)$(VENDOR_GCC_RELEASE)

endif
@@ -41,7 +41,7 @@ endif 
GCC_SOURCE:=gcc-$(GCC_OFFICIAL_VER).tar.bz2

GCC_DIR:=$(TOOL_BUILD_DIR)/gcc-$(GCC_OFFICIAL_VER)



ifeq ($(BR2_TOOLCHAIN_NORMAL),y)

ifeq ($(BR2_TOOLCHAIN_SOURCE),y)

ifeq ($(GCC_SNAP_DATE),)

GCC_PATCH_DIR:=toolchain/gcc/$(GCC_VERSION)

else