From bbf9e8ae5e0ce2968e4fef071d3de3ddfdc7463c Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Sat, 22 Feb 2020 10:30:27 +0000 Subject: binutils: Fix x86_64 override usage This override was applying to binutils-native meaning it would behave differently depending upon the host it was building on. This is not a good idea and we have tests to detect it which failed: oe-selftest -r sstatetests.SStateTests.test_sstate_32_64_same_hash binutils-native already enables all targets so we can avoid issues by not setting this option in the native case. Signed-off-by: Richard Purdie --- meta/recipes-devtools/binutils/binutils.inc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/meta/recipes-devtools/binutils/binutils.inc b/meta/recipes-devtools/binutils/binutils.inc index 5b4a339209..6ed40a1486 100644 --- a/meta/recipes-devtools/binutils/binutils.inc +++ b/meta/recipes-devtools/binutils/binutils.inc @@ -75,9 +75,12 @@ EXTRA_OECONF = "--program-prefix=${TARGET_PREFIX} \ --enable-deterministic-archives \ --enable-plugins \ ${LDGOLD} \ + ${EXTRA_TARGETS} \ ${@bb.utils.contains('DISTRO_FEATURES', 'multiarch', '--enable-64-bit-bfd', '', d)}" -EXTRA_OECONF_append_x86-64 = " --enable-targets=x86_64-pe,x86_64-pep " +EXTRA_TARGETS = "" +EXTRA_TARGETS_x86-64 = " --enable-targets=x86_64-pe,x86_64-pep " +EXTRA_TARGETS_class-native = "" LDGOLD_class-native = "" LDGOLD_class-crosssdk = "" -- cgit 1.2.3-korg