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:42:04 +0100 |
commit | b78173f176eeff553e2e941bd06ff032daebc7be (patch) | |
tree | d5d5d1473a242f9a5d4828351ce42967fe5da466 /meta/recipes-devtools/gcc/gcc-cross-intermediate.inc | |
parent | 5e480e526fa61515b80a05ebe0ea163b9d8f01bb (diff) | |
download | poky-b78173f176eeff553e2e941bd06ff032daebc7be.tar.gz |
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.
(From OE-Core rev: 207a9013670560d62c793a66f01e19f4760a71a8)
Signed-off-by: Phil Blundell <philb@gnu.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/gcc/gcc-cross-intermediate.inc')
-rw-r--r-- | meta/recipes-devtools/gcc/gcc-cross-intermediate.inc | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/meta/recipes-devtools/gcc/gcc-cross-intermediate.inc b/meta/recipes-devtools/gcc/gcc-cross-intermediate.inc index 92c3ce2059..05b5dbc089 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}" | |||
7 | 7 | ||
8 | # This is intended to be a -very- basic config | 8 | # This is intended to be a -very- basic config |
9 | # sysroot is needed in case we use libc-initial | 9 | # sysroot is needed in case we use libc-initial |
10 | # | ||
11 | # Glibc won't compile with gold, and building glibc is the whole point of | ||
12 | # this recipe. So we select ld.bfd explicitly here if gold is the distro's | ||
13 | # preferred linker. | ||
10 | EXTRA_OECONF = "--with-local-prefix=${STAGING_DIR_TARGET}${target_prefix} \ | 14 | EXTRA_OECONF = "--with-local-prefix=${STAGING_DIR_TARGET}${target_prefix} \ |
11 | --enable-shared \ | 15 | --enable-shared \ |
12 | --disable-multilib \ | 16 | --disable-multilib \ |
@@ -17,7 +21,8 @@ EXTRA_OECONF = "--with-local-prefix=${STAGING_DIR_TARGET}${target_prefix} \ | |||
17 | --with-sysroot=${STAGING_DIR_TCBOOTSTRAP} \ | 21 | --with-sysroot=${STAGING_DIR_TCBOOTSTRAP} \ |
18 | --with-build-sysroot=${STAGING_DIR_TCBOOTSTRAP} \ | 22 | --with-build-sysroot=${STAGING_DIR_TCBOOTSTRAP} \ |
19 | ${EXTRA_OECONF_INTERMEDIATE} \ | 23 | ${EXTRA_OECONF_INTERMEDIATE} \ |
20 | ${@get_gcc_fpu_setting(bb, d)}" | 24 | ${@get_gcc_fpu_setting(bb, d)} \ |
25 | ${@base_contains('DISTRO_FEATURES', 'ld-is-gold', '--with-ld=${STAGING_BINDIR_TOOLCHAIN}/${TARGET_PREFIX}ld.bfd', '', d)}" | ||
21 | 26 | ||
22 | do_populate_sysroot[sstate-inputdirs] = "${SYSROOT_DESTDIR}/${STAGING_DIR_HOST} ${SYSROOT_DESTDIR}/${STAGING_DIR_TARGET}/${target_base_libdir}" | 27 | do_populate_sysroot[sstate-inputdirs] = "${SYSROOT_DESTDIR}/${STAGING_DIR_HOST} ${SYSROOT_DESTDIR}/${STAGING_DIR_TARGET}/${target_base_libdir}" |
23 | do_populate_sysroot[sstate-outputdirs] = "${STAGING_DIR_HOST} ${STAGING_DIR_TCBOOTSTRAP}/${target_base_libdir}" | 28 | do_populate_sysroot[sstate-outputdirs] = "${STAGING_DIR_HOST} ${STAGING_DIR_TCBOOTSTRAP}/${target_base_libdir}" |