Commit 29a9d99b authored by Peter Korsgaard's avatar Peter Korsgaard
Browse files

Merge branch 'remove-external-toolchain' of git://git.busybox.net/~tpetazzoni/git/buildroot

parents a2fd9751 c3750228

Makefile

+2 −2
Original line number Diff line number Diff line
@@ -197,7 +197,7 @@ PREFERRED_LIB_FLAGS:=--enable-static --enable-shared 
# along with the packages to build for the target.

#

##############################################################

ifeq ($(BR2_TOOLCHAIN_SOURCE),y)

ifeq ($(BR2_TOOLCHAIN_BUILDROOT),y)

BASE_TARGETS:=uclibc-configured binutils cross_compiler uclibc-target-utils kernel-headers

else

BASE_TARGETS:=uclibc
@@ -289,7 +289,7 @@ include .config.cmd 
# We also need the various per-package makefiles, which also add

# each selected package to TARGETS if that package was selected

# in the .config file.

ifeq ($(BR2_TOOLCHAIN_SOURCE),y)

ifeq ($(BR2_TOOLCHAIN_BUILDROOT),y)

# avoid pulling in external toolchain which is broken for toplvl parallel builds

# Explicit ordering:

include toolchain/dependencies/dependencies.mk

configs/arm_toolchain_defconfig

+0 −11
Original line number Diff line number Diff line
@@ -190,17 +190,6 @@ BR2_UPDATE_CONFIG=y 
#

BR2_TOOLCHAIN_BUILDROOT=y

# BR2_TOOLCHAIN_EXTERNAL is not set

# BR2_TOOLCHAIN_EXTERNAL_SOURCE is not set

BR2_TOOLCHAIN_SOURCE=y

BR2_EXT_GCC_VERSION_4_1_2=y

BR2_EXT_GCC_VERSION_4_2_1=y

BR2_EXT_GCC_VERSION_4_2_2=y

BR2_EXT_GCC_VERSION_4_2_3=y

BR2_EXT_BINUTILS_VERSION_2_17=y

BR2_EXT_BINUTILS_VERSION_2_18=y

BR2_EXT_UCLIBC_VERSION_0_9_28_3=y

BR2_EXT_UCLIBC_VERSION_0_9_29=y

BR2_EXT_UCLIBC_VERSION_0_9_30=y



#

# Kernel Header Options

configs/at91rm9200df_defconfig

+0 −11
Original line number Diff line number Diff line
@@ -195,17 +195,6 @@ BR2_UPDATE_CONFIG=y 
#

BR2_TOOLCHAIN_BUILDROOT=y

# BR2_TOOLCHAIN_EXTERNAL is not set

# BR2_TOOLCHAIN_EXTERNAL_SOURCE is not set

BR2_TOOLCHAIN_SOURCE=y

BR2_EXT_GCC_VERSION_4_1_2=y

BR2_EXT_GCC_VERSION_4_2_1=y

BR2_EXT_GCC_VERSION_4_2_2=y

BR2_EXT_GCC_VERSION_4_2_3=y

BR2_EXT_BINUTILS_VERSION_2_17=y

BR2_EXT_BINUTILS_VERSION_2_18=y

BR2_EXT_UCLIBC_VERSION_0_9_28_3=y

BR2_EXT_UCLIBC_VERSION_0_9_29=y

BR2_EXT_UCLIBC_VERSION_0_9_30=y



#

# Kernel Header Options

configs/at91rm9200df_ext_bare_defconfig

+0 −11
Original line number Diff line number Diff line
@@ -190,19 +190,8 @@ BR2_UPDATE_CONFIG=y 
#

# BR2_TOOLCHAIN_BUILDROOT is not set

BR2_TOOLCHAIN_EXTERNAL=y

# BR2_TOOLCHAIN_EXTERNAL_SOURCE is not set

# BR2_TOOLCHAIN_SOURCE is not set

BR2_TOOLCHAIN_EXTERNAL_PATH="$(GCCROOT)"

BR2_TOOLCHAIN_EXTERNAL_PREFIX="$(ARCH)-linux"

BR2_EXT_GCC_VERSION_4_1_2=y

BR2_EXT_GCC_VERSION_4_2_1=y

BR2_EXT_GCC_VERSION_4_2_2=y

BR2_EXT_GCC_VERSION_4_2_3=y

BR2_EXT_BINUTILS_VERSION_2_17=y

BR2_EXT_BINUTILS_VERSION_2_18=y

BR2_EXT_UCLIBC_VERSION_0_9_28_3=y

BR2_EXT_UCLIBC_VERSION_0_9_29=y

BR2_EXT_UCLIBC_VERSION_0_9_30=y

BR2_TOOLCHAIN_EXTERNAL_LIB_C="libc.so.0"

BR2_TOOLCHAIN_EXTERNAL_LIBS="ld-uClibc.so.0 libcrypt.so.0 libdl.so.0 libgcc_s.so libm.so.0 libnsl.so.0 libpthread.so.0 libresolv.so.0 librt.so.0 libutil.so.0"

BR2_TOOLCHAIN_EXTERNAL_STRIP=y

configs/at91rm9200df_ext_defconfig

+0 −11
Original line number Diff line number Diff line
@@ -201,19 +201,8 @@ BR2_UPDATE_CONFIG=y 
#

# BR2_TOOLCHAIN_BUILDROOT is not set

BR2_TOOLCHAIN_EXTERNAL=y

# BR2_TOOLCHAIN_EXTERNAL_SOURCE is not set

# BR2_TOOLCHAIN_SOURCE is not set

BR2_TOOLCHAIN_EXTERNAL_PATH="$(GCCROOT)"

BR2_TOOLCHAIN_EXTERNAL_PREFIX="$(ARCH)-linux"

BR2_EXT_GCC_VERSION_4_1_2=y

BR2_EXT_GCC_VERSION_4_2_1=y

BR2_EXT_GCC_VERSION_4_2_2=y

BR2_EXT_GCC_VERSION_4_2_3=y

BR2_EXT_BINUTILS_VERSION_2_17=y

BR2_EXT_BINUTILS_VERSION_2_18=y

BR2_EXT_UCLIBC_VERSION_0_9_28_3=y

BR2_EXT_UCLIBC_VERSION_0_9_29=y

BR2_EXT_UCLIBC_VERSION_0_9_30=y

BR2_TOOLCHAIN_EXTERNAL_LIB_C="libc.so.0"

BR2_TOOLCHAIN_EXTERNAL_LIBS="ld-uClibc.so.0 libcrypt.so.0 libdl.so.0 libgcc_s.so libm.so.0 libnsl.so.0 libpthread.so.0 libresolv.so.0 librt.so.0 libutil.so.0"

BR2_TOOLCHAIN_EXTERNAL_STRIP=y