diff options
| author | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2009-12-14 12:10:12 +0100 |
|---|---|---|
| committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2009-12-14 23:54:47 +0100 |
| commit | bc994c533cdac1ab843a889c4afaae80234cc6b2 (patch) | |
| tree | 1802f44de52ea1bf9614843b1115dcd6bbab7ab6 /toolchain | |
| parent | 8a5c3653acf1a86a7a613ee43f3cab9ee03a68b3 (diff) | |
Use BR2_TOOLCHAIN_BUILDROOT instead of BR2_TOOLCHAIN_SOURCE
The BR2_TOOLCHAIN_SOURCE option is removed in a future commit.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'toolchain')
| -rw-r--r-- | toolchain/Config.in.1 | 2 | ||||
| -rw-r--r-- | toolchain/Config.in.2 | 6 | ||||
| -rw-r--r-- | toolchain/gcc/gcc-uclibc-3.x.mk | 2 | ||||
| -rw-r--r-- | toolchain/uClibc/uclibc.mk | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/toolchain/Config.in.1 b/toolchain/Config.in.1 index 83bc710b6..5c26858d0 100644 --- a/toolchain/Config.in.1 +++ b/toolchain/Config.in.1 @@ -1,6 +1,6 @@ # -if BR2_TOOLCHAIN_SOURCE +if BR2_TOOLCHAIN_BUILDROOT source "toolchain/kernel-headers/Config.in" source "toolchain/uClibc/Config.in" source "toolchain/binutils/Config.in" diff --git a/toolchain/Config.in.2 b/toolchain/Config.in.2 index 2f7de75b6..6317ff4fb 100644 --- a/toolchain/Config.in.2 +++ b/toolchain/Config.in.2 @@ -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" diff --git a/toolchain/gcc/gcc-uclibc-3.x.mk b/toolchain/gcc/gcc-uclibc-3.x.mk index 0af3f38e6..332af884a 100644 --- a/toolchain/gcc/gcc-uclibc-3.x.mk +++ b/toolchain/gcc/gcc-uclibc-3.x.mk @@ -17,7 +17,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -ifeq ($(BR2_TOOLCHAIN_SOURCE),y) +ifeq ($(BR2_TOOLCHAIN_BUILDROOT),y) # without sysroot support. Sysroot toolchain is gcc-uclibc-4.x.mk ifneq ($(BR2_TOOLCHAIN_SYSROOT),y) diff --git a/toolchain/uClibc/uclibc.mk b/toolchain/uClibc/uclibc.mk index 79d272fea..f742d4ef4 100644 --- a/toolchain/uClibc/uclibc.mk +++ b/toolchain/uClibc/uclibc.mk @@ -4,7 +4,7 @@ # ############################################################# -ifeq ($(BR2_TOOLCHAIN_SOURCE),y) +ifeq ($(BR2_TOOLCHAIN_BUILDROOT),y) # specifying UCLIBC_CONFIG_FILE on the command-line overrides the .config # setting. |