summaryrefslogtreecommitdiffstats
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:57:27 +0000
commit28333a851ffee3f5865ec97a8d098022efaf5147 (patch)
tree3318ecbbc3b2e1b5cf34a55c241cb84f405e8c78
parentfd0e3e1708393cf4b59802843c2c6c917798145c (diff)
downloadpoky-28333a851ffee3f5865ec97a8d098022efaf5147.tar.gz
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. (From OE-Core rev: bbf9e8ae5e0ce2968e4fef071d3de3ddfdc7463c) 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 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} \
75 --enable-deterministic-archives \ 75 --enable-deterministic-archives \
76 --enable-plugins \ 76 --enable-plugins \
77 ${LDGOLD} \ 77 ${LDGOLD} \
78 ${EXTRA_TARGETS} \
78 ${@bb.utils.contains('DISTRO_FEATURES', 'multiarch', '--enable-64-bit-bfd', '', d)}" 79 ${@bb.utils.contains('DISTRO_FEATURES', 'multiarch', '--enable-64-bit-bfd', '', d)}"
79 80
80EXTRA_OECONF_append_x86-64 = " --enable-targets=x86_64-pe,x86_64-pep " 81EXTRA_TARGETS = ""
82EXTRA_TARGETS_x86-64 = " --enable-targets=x86_64-pe,x86_64-pep "
83EXTRA_TARGETS_class-native = ""
81 84
82LDGOLD_class-native = "" 85LDGOLD_class-native = ""
83LDGOLD_class-crosssdk = "" 86LDGOLD_class-crosssdk = ""