[oe-commits] [openembedded-core] 01/02: binutils: Fix x86_64 override usage

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master-next
in repository openembedded-core.

commit dada7170f22ff4fe79b2a8b1056ab1ce223b1653
Author: Richard Purdie <richard.purdie at linuxfoundation.org>
AuthorDate: Sat Feb 22 10:30:27 2020 +0000

    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 at linuxfoundation.org>
---
 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 5b4a339..6ed40a1 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 = ""

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.