From a8daee2fe41d633013e2f5e3e30556f1790072ca Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sun, 16 Feb 2014 19:48:16 +0000 Subject: binutils: ld-is-gold should not affect native and crosssdk recipes gold linker does not support all architectures, currently arm and x86 are best supported, therefore we can not enable this as a full distro option where we need to support other architectures e.g. ppc, mips currently, if we enable ld-is-gold distro feature conditionally then it invalidates native and sdk version of native binutils because configure option would change. With this patch we limit ld-is-gold feature to imapact cross binutils and target binutils only. This means that we can reuse the sdk and native versions across architectures. (From OE-Core rev: 542609b968f0dc6f56cc9d6aabe4ff0144041261) Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- meta/recipes-devtools/binutils/binutils.inc | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/meta/recipes-devtools/binutils/binutils.inc b/meta/recipes-devtools/binutils/binutils.inc index 6380d54a96..7f084b5cc4 100644 --- a/meta/recipes-devtools/binutils/binutils.inc +++ b/meta/recipes-devtools/binutils/binutils.inc @@ -67,10 +67,14 @@ B = "${S}/build.${HOST_SYS}.${TARGET_SYS}" EXTRA_OECONF = "--program-prefix=${TARGET_PREFIX} \ --disable-werror \ - --enable-plugins \ - ${@base_contains('DISTRO_FEATURES', 'ld-is-gold', '--enable-gold=default --enable-threads', '', d)} \ + --enable-plugins \ + ${LDGOLD} \ ${@base_contains('DISTRO_FEATURES', 'multiarch', '--enable-64-bit-bfd', '', d)}" +LDGOLD_class-native = "" +LDGOLD_class-crosssdk = "" +LDGOLD ?= "${@base_contains('DISTRO_FEATURES', 'ld-is-gold', '--enable-gold=default --enable-threads', '', d)}" + # This is necessary due to a bug in the binutils Makefiles # EXTRA_OEMAKE = "configure-build-libiberty all" -- cgit v1.2.3-54-g00ecf