diff options
| author | Phil Blundell <pb@pbcl.net> | 2011-06-27 16:51:16 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-06-30 22:40:31 +0100 |
| commit | 207a9013670560d62c793a66f01e19f4760a71a8 (patch) | |
| tree | 6f857d77ef7fc6d5c0bd970543d2d36459710aa9 | |
| parent | 577b16b4e4984e7fbdba7df88b0c40539f0f3167 (diff) | |
| download | openembedded-core-207a9013670560d62c793a66f01e19f4760a71a8.tar.gz openembedded-core-207a9013670560d62c793a66f01e19f4760a71a8.tar.bz2 openembedded-core-207a9013670560d62c793a66f01e19f4760a71a8.tar.xz openembedded-core-207a9013670560d62c793a66f01e19f4760a71a8.zip | |
binutils: allow distro to select gold as default linker
But ensure that gcc-cross-intermediate always uses ld.bfd since
(e)glibc won't build with gold.
Signed-off-by: Phil Blundell <philb@gnu.org>
| -rw-r--r-- | meta/recipes-devtools/binutils/binutils-cross.inc | 3 | ||||
| -rw-r--r-- | meta/recipes-devtools/gcc/gcc-cross-intermediate.inc | 7 |
2 files changed, 8 insertions, 2 deletions
diff --git a/meta/recipes-devtools/binutils/binutils-cross.inc b/meta/recipes-devtools/binutils/binutils-cross.inc index 4b909720d..5a41970ce 100644 --- a/meta/recipes-devtools/binutils/binutils-cross.inc +++ b/meta/recipes-devtools/binutils/binutils-cross.inc @@ -5,7 +5,8 @@ EXTRA_OECONF = "--with-sysroot=${STAGING_DIR_TARGET} \ --program-prefix=${TARGET_PREFIX} \ --disable-install-libbfd \ --disable-werror \ - --enable-poison-system-directories" + --enable-poison-system-directories \ + ${@base_contains('DISTRO_FEATURES', 'ld-is-gold', '--enable-gold=default', '', d)}" do_install () { oe_runmake 'DESTDIR=${D}' install diff --git a/meta/recipes-devtools/gcc/gcc-cross-intermediate.inc b/meta/recipes-devtools/gcc/gcc-cross-intermediate.inc index 92c3ce205..05b5dbc08 100644 --- a/meta/recipes-devtools/gcc/gcc-cross-intermediate.inc +++ b/meta/recipes-devtools/gcc/gcc-cross-intermediate.inc @@ -7,6 +7,10 @@ CROSS_TARGET_SYS_DIR_append = ".${PN}" # This is intended to be a -very- basic config # sysroot is needed in case we use libc-initial +# +# Glibc won't compile with gold, and building glibc is the whole point of +# this recipe. So we select ld.bfd explicitly here if gold is the distro's +# preferred linker. EXTRA_OECONF = "--with-local-prefix=${STAGING_DIR_TARGET}${target_prefix} \ --enable-shared \ --disable-multilib \ @@ -17,7 +21,8 @@ EXTRA_OECONF = "--with-local-prefix=${STAGING_DIR_TARGET}${target_prefix} \ --with-sysroot=${STAGING_DIR_TCBOOTSTRAP} \ --with-build-sysroot=${STAGING_DIR_TCBOOTSTRAP} \ ${EXTRA_OECONF_INTERMEDIATE} \ - ${@get_gcc_fpu_setting(bb, d)}" + ${@get_gcc_fpu_setting(bb, d)} \ + ${@base_contains('DISTRO_FEATURES', 'ld-is-gold', '--with-ld=${STAGING_BINDIR_TOOLCHAIN}/${TARGET_PREFIX}ld.bfd', '', d)}" do_populate_sysroot[sstate-inputdirs] = "${SYSROOT_DESTDIR}/${STAGING_DIR_HOST} ${SYSROOT_DESTDIR}/${STAGING_DIR_TARGET}/${target_base_libdir}" do_populate_sysroot[sstate-outputdirs] = "${STAGING_DIR_HOST} ${STAGING_DIR_TCBOOTSTRAP}/${target_base_libdir}" |