aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2020-02-22 10:30:27 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-02-22 23:51:46 +0000
commitbbf9e8ae5e0ce2968e4fef071d3de3ddfdc7463c (patch)
tree4bf4340ceb7e80245b258b7a74cdea2c5ec9542b
parent82f7d5cfc2ab02f39b69c0f8697d660936422d4a (diff)
downloadopenembedded-core-contrib-bbf9e8ae5e0ce2968e4fef071d3de3ddfdc7463c.tar.gz
openembedded-core-contrib-bbf9e8ae5e0ce2968e4fef071d3de3ddfdc7463c.tar.bz2
openembedded-core-contrib-bbf9e8ae5e0ce2968e4fef071d3de3ddfdc7463c.zip
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 <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/binutils/binutils.inc5
1 files changed, 4 insertions, 1 deletions
diff --git a/meta/recipes-devtools/binutils/binutils.inc b/meta/recipes-devtools/binutils/binutils.inc
index 5b4a3392092..6ed40a14861 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 = ""