diff options
| author | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2013-09-02 18:06:29 +0200 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2013-09-15 22:50:20 +0200 |
| commit | 2babed4a50fcd050abc4686e05e24d0e374d10a8 (patch) | |
| tree | 28e47f2aecb6ad0aa8274e18539faa8a19f08a4a /package/uclibc | |
| parent | a8164107ecc07933b244fd436ad1025d8ae1aff1 (diff) | |
| download | buildroot-2babed4a50fcd050abc4686e05e24d0e374d10a8.tar.gz buildroot-2babed4a50fcd050abc4686e05e24d0e374d10a8.zip | |
toolchain-internal: skip gcc-intermediate when possible
When NPTL support was introduced, gcc required a three stages build
process. Since gcc 4.7, this is no longer necessary, and it is
possible to get back to a two stages build process. This patch takes
advantage of this, by doing a two stages build process when possible.
We introduce a few hidden kconfig options:
* BR2_GCC_VERSION_NEEDS_THREE_STAGE_BUILD, which is set by the gcc
Config.in logic to indicate that the compiler might need a three
stages build. Currently, all versions prior to 4.7.x are selecting
this kconfig option.
* BR2_TOOLCHAIN_LIBC_NEEDS_THREE_STAGE_BUILD, which indicates whether
the C library might need a three stages build. This is the case for
eglibc, and uClibc when NPTL is enabled.
* BR2_TOOLCHAIN_NEEDS_THREE_STAGE_BUILD finally is enabled when both
of the previous options are enabled. It indicates that a three
stages build is actually needed.
In addition to those options, the uClibc/gcc build logic is changed to
use only a two stages build process when possible.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Diffstat (limited to 'package/uclibc')
| -rw-r--r-- | package/uclibc/Config.in | 1 | ||||
| -rw-r--r-- | package/uclibc/uclibc.mk | 5 |
2 files changed, 4 insertions, 2 deletions
diff --git a/package/uclibc/Config.in b/package/uclibc/Config.in index 92e04e9d61..037ca01c0d 100644 --- a/package/uclibc/Config.in +++ b/package/uclibc/Config.in @@ -115,6 +115,7 @@ choice config BR2_PTHREADS_NATIVE bool "Native POSIX Threading (NPTL)" select BR2_TOOLCHAIN_HAS_THREADS + select BR2_TOOLCHAIN_LIBC_NEEDS_THREE_STAGE_BUILD depends on !BR2_arc depends on !BR2_avr32 depends on !BR2_bfin diff --git a/package/uclibc/uclibc.mk b/package/uclibc/uclibc.mk index 39877bbbf9..181a772fb3 100644 --- a/package/uclibc/uclibc.mk +++ b/package/uclibc/uclibc.mk @@ -22,8 +22,9 @@ UCLIBC_INSTALL_STAGING = YES # cross-compiler and the kernel headers UCLIBC_DEPENDENCIES = host-gcc-initial linux-headers -# Before uClibc is built, we must have the second stage cross-compiler -uclibc-build: host-gcc-intermediate +# Before uClibc is built, we must have the second stage +# cross-compiler, for some gcc versions, and when NPTL is used. +uclibc-build: $(if $(BR2_TOOLCHAIN_NEEDS_THREE_STAGE_BUILD),host-gcc-intermediate) # specifying UCLIBC_CONFIG_FILE on the command-line overrides the .config # setting. |
