Commit bc994c53 authored by Thomas Petazzoni's avatar Thomas Petazzoni
Browse files

Use BR2_TOOLCHAIN_BUILDROOT instead of BR2_TOOLCHAIN_SOURCE 



The BR2_TOOLCHAIN_SOURCE option is removed in a future commit.

Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
parent 8a5c3653

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

package/Makefile.in

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




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

ifeq ($(BR2_TOOLCHAIN_SOURCE),y)

ifeq ($(BR2_TOOLCHAIN_BUILDROOT),y)

TARGET_CFLAGS=$(TARGET_OPTIMIZATION) $(TARGET_DEBUGGING) \

	-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include

TARGET_LDFLAGS+=-L$(STAGING_DIR)/lib -L$(STAGING_DIR)/usr/lib
@@ -105,7 +105,7 @@ XXXX=xxxx 
ROOTFS_SUFFIX:=-$(BR2_ROOTFS_SUFFIX)

endif



ifeq ($(BR2_TOOLCHAIN_SOURCE),y)

ifeq ($(BR2_TOOLCHAIN_BUILDROOT),y)

TOOLCHAIN_DIR=$(BASE_DIR)/toolchain



# Quotes are needed for spaces et al in path components.

target/Config.in

+1 −1
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ config BR2_KERNEL_LINUX_ADVANCED 
# The kernel with the same version as linux headers cannot be compiled

# when using an external toolchain, because the linux headers are not

# handled by Buildroot in this case.

if BR2_TOOLCHAIN_SOURCE

if BR2_TOOLCHAIN_BUILDROOT



config BR2_KERNEL_LINUX

	bool "linux (Same version as linux headers)"

toolchain/Config.in.1

+1 −1
Original line number Diff line number Diff line 
#



if BR2_TOOLCHAIN_SOURCE

if BR2_TOOLCHAIN_BUILDROOT

source "toolchain/kernel-headers/Config.in"

source "toolchain/uClibc/Config.in"

source "toolchain/binutils/Config.in"

toolchain/Config.in.2

+3 −3
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ config BR2_ENABLE_LOCALE 


config BR2_ENABLE_LOCALE_PREGENERATED

	bool "Use pregenerated locale data?"

	depends on BR2_ENABLE_LOCALE && BR2_TOOLCHAIN_SOURCE && BROKEN # tarball missing

	depends on BR2_ENABLE_LOCALE && BR2_TOOLCHAIN_BUILDROOT && BROKEN # tarball missing

	help

	  Instead of generating the locale data locally you can optionally

	  download a pregenerated set of locales.
@@ -142,7 +142,7 @@ config BR2_GCC_CROSS_CXX 


config BR2_INSTALL_LIBSTDCPP

	bool "Build/install c++ compiler and libstdc++?"

	select BR2_LARGEFILE if (!BR2_GCC_SUPPORTS_SYSROOT && BR2_TOOLCHAIN_SOURCE)

	select BR2_LARGEFILE if (!BR2_GCC_SUPPORTS_SYSROOT && BR2_TOOLCHAIN_BUILDROOT)

	select BR2_GCC_CROSS_CXX

	help

	  If you are building your own toolchain and want to build and install
@@ -157,7 +157,7 @@ config BR2_TARGET_OPTIMIZATION 
	help

	  Optimizations to use when building for the target host.



if BR2_TOOLCHAIN_SOURCE

if BR2_TOOLCHAIN_BUILDROOT

source "toolchain/elf2flt/Config.in"

source "toolchain/mklibs/Config.in"

source "toolchain/sstrip/Config.in"