summaryrefslogtreecommitdiffstats
path: root/meta
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:30 +0100
commit2c8cc36f240fca72b84d2b9cabb82faf2fa7f810 (patch)
tree0cbe6cca5989e5a480eb98599bf91570e650dd45 /meta
parent6c222a5c11ee1abe2b5b81e97d4dc6ac7346410b (diff)
downloadpoky-2c8cc36f240fca72b84d2b9cabb82faf2fa7f810.tar.gz
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>
Diffstat (limited to 'meta')
-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
13# e.g. we switch between different machines with different tunes. 13# e.g. we switch between different machines with different tunes.
14EXTRA_OECONF[vardepsexclude] = "TUNE_PKGARCH" 14EXTRA_OECONF[vardepsexclude] = "TUNE_PKGARCH"
15 15
16LDGOLD_sdkmingw32 = ""
17
16do_install () { 18do_install () {
17 autotools_do_install 19 autotools_do_install
18 20
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} \
78 78
79LDGOLD_class-native = "" 79LDGOLD_class-native = ""
80LDGOLD_class-crosssdk = "" 80LDGOLD_class-crosssdk = ""
81LDGOLD_sdkmingw32 = ""
82LDGOLD ?= "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', '--enable-gold=default --enable-threads', '--enable-gold --enable-ld=default --enable-threads', d)}" 81LDGOLD ?= "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', '--enable-gold=default --enable-threads', '--enable-gold --enable-ld=default --enable-threads', d)}"
83 82
84# This is necessary due to a bug in the binutils Makefiles 83# This is necessary due to a bug in the binutils Makefiles