summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSamuli Piippo <samuli.piippo@qt.io>2017-09-15 13:07:07 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-09-18 11:07:24 +0100
commit0398f84482dbe5ee99b20e2ca6b3e9984f7ccec5 (patch)
treeb782f05a0b1e85d92177de97fa8346e16afe1c5f
parent46eb839b51bb1466a9feeb09c9c437d6d45576cc (diff)
downloadopenembedded-core-contrib-0398f84482dbe5ee99b20e2ca6b3e9984f7ccec5.tar.gz
openembedded-core-contrib-0398f84482dbe5ee99b20e2ca6b3e9984f7ccec5.tar.bz2
openembedded-core-contrib-0398f84482dbe5ee99b20e2ca6b3e9984f7ccec5.zip
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. Signed-off-by: Samuli Piippo <samuli.piippo@qt.io> Signed-off-by: Ross Burton <ross.burton@intel.com>
-rw-r--r--meta/recipes-devtools/binutils/binutils-cross-canadian.inc2
-rw-r--r--meta/recipes-devtools/binutils/binutils.inc1
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 b3d591e658..e98f31f9c3 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 7efe13fdf6..37813dd864 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