diff options
author | Samuli Piippo <samuli.piippo@qt.io> | 2017-09-15 13:07:07 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-11-05 22:39:47 +0000 |
commit | faf109ca946cb2703b06997db1abd6931ed6dcb2 (patch) | |
tree | d7944083f062e9d9b8042e0b382f011b1db08cc3 /meta | |
parent | 65c54c2700bddeda7321c06260090a9d04933f98 (diff) | |
download | poky-faf109ca946cb2703b06997db1abd6931ed6dcb2.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)
(From OE-Core rev: ef5f97aea26fa22accfd1841a2f1319935d6d95f)
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>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-devtools/binutils/binutils-cross-canadian.inc | 2 | ||||
-rw-r--r-- | 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 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. |
14 | EXTRA_OECONF[vardepsexclude] = "TUNE_PKGARCH" | 14 | EXTRA_OECONF[vardepsexclude] = "TUNE_PKGARCH" |
15 | 15 | ||
16 | LDGOLD_sdkmingw32 = "" | ||
17 | |||
16 | do_install () { | 18 | do_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 | ||
79 | LDGOLD_class-native = "" | 79 | LDGOLD_class-native = "" |
80 | LDGOLD_class-crosssdk = "" | 80 | LDGOLD_class-crosssdk = "" |
81 | LDGOLD_sdkmingw32 = "" | ||
82 | LDGOLD ?= "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', '--enable-gold=default --enable-threads', '--enable-gold --enable-ld=default --enable-threads', d)}" | 81 | LDGOLD ?= "${@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 |