tcmode-external-sourcery: pass -msgxx-glibc for x86

This is needed to work around an issue with the toolchain search paths. It can
pick up the wrong features.h without it, it seems, even with the system32
symlink in the oe sysroot. Investigate this further in the future.

(From OE-Core rev: fb94ed0eb11b2efc1d814b80a2a7c99b29e746b3)

Signed-off-by: Christopher Larson <chris_larson@mentor.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

1 files changed, 2 insertions, 5 deletions

diff --git a/meta/conf/distro/include/tcmode-external-sourcery.inc b/meta/conf/distro/include/tcmode-external-sourcery.inc
index ede4403d4c..1635eec813 100644
--- a/meta/conf/distro/include/tcmode-external-sourcery.inc
+++ b/meta/conf/distro/include/tcmode-external-sourcery.inc
@@ -56,11 +56,8 @@ EXTERNAL_TOOLCHAIN_SYSROOT ??= "${@exttc_run(d, EXTERNAL_TOOLCHAIN_SYSROOT_CMD)}
 # These bits are here temporarily to sidestep the need to use a separate set
 # of tune files to pass the appropriate multilib selection arguments to the
 # sourcery toolchain, as is needed to extract the sysroot content.
-CSL_MULTILIB_ARGS[i586] ?= "-msgxx-glibc"
-CSL_MULTILIB_ARGS[i686] ?= "-msgxx-glibc"
-CSL_MULTILIB_ARGS[core2] ?= "-msgxx-glibc"
-CSL_MULTILIB_ARGS[x86] ?= "-msgxx-glibc"
-CSL_MULTILIB_ARGS[x86-64] ?= "-msgxx-glibc"
+TUNE_CCARGS_append_x86 = " -msgxx-glibc"
+
 CSL_MULTILIB_ARGS[ppce500] ?= "-te500v1"
 CSL_MULTILIB_ARGS[ppce500mc] ?= "-te500mc"
 CSL_MULTILIB_ARGS[ppce500v2] ?= "-te500v2"