[gnome-continuous-yocto/gnomeostree-3.28-rocko: 7786/8267] binutils: apply mingw fix only for binutils-cross-canadian

[Emmanuele Bassi <ebassi src gnome org>]

commit 2c8cc36f240fca72b84d2b9cabb82faf2fa7f810
Author: Samuli Piippo <samuli piippo qt io>
Date:   Fri Sep 15 13:07:07 2017 +0300

    binutils: apply mingw fix only for binutils-cross-canadian
    
    Whenever SDKMACHINE is set to mingw32, sdkmingw32 override is defined
    everywhere. This meant that value of LDGOLD was different also for
    binutils and binutils-cross depending whether SDKMACHINE was set or not.
    
    (From OE-Core rev: 0398f84482dbe5ee99b20e2ca6b3e9984f7ccec5)
    
    Signed-off-by: Samuli Piippo <samuli piippo qt io>
    Signed-off-by: Ross Burton <ross burton intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 .../binutils/binutils-cross-canadian.inc           |    2 ++
 meta/recipes-devtools/binutils/binutils.inc        |    1 -
 2 files changed, 2 insertions(+), 1 deletions(-)
---
diff --git a/meta/recipes-devtools/binutils/binutils-cross-canadian.inc 
b/meta/recipes-devtools/binutils/binutils-cross-canadian.inc
index b3d591e..e98f31f 100644
--- a/meta/recipes-devtools/binutils/binutils-cross-canadian.inc
+++ b/meta/recipes-devtools/binutils/binutils-cross-canadian.inc
@@ -13,6 +13,8 @@ EXTRA_OECONF += "--with-sysroot=${SDKPATH}/sysroots/${TUNE_PKGARCH}${TARGET_VEND
 # e.g. we switch between different machines with different tunes.
 EXTRA_OECONF[vardepsexclude] = "TUNE_PKGARCH"
 
+LDGOLD_sdkmingw32 = ""
+
 do_install () {
        autotools_do_install
 
diff --git a/meta/recipes-devtools/binutils/binutils.inc b/meta/recipes-devtools/binutils/binutils.inc
index 7efe13f..37813dd 100644
--- a/meta/recipes-devtools/binutils/binutils.inc
+++ b/meta/recipes-devtools/binutils/binutils.inc
@@ -78,7 +78,6 @@ EXTRA_OECONF = "--program-prefix=${TARGET_PREFIX} \
 
 LDGOLD_class-native = ""
 LDGOLD_class-crosssdk = ""
-LDGOLD_sdkmingw32 = ""
 LDGOLD ?= "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', '--enable-gold=default --enable-threads', 
'--enable-gold --enable-ld=default --enable-threads', d)}"
 
 # This is necessary due to a bug in the binutils Makefiles