[oe-commits] Yuanjie Huang : gcc-multilib-config: Expand ccargs variable

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master-next
Commit: 1c83d312d117c1fc607000fc78e6a36660fec4e5
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=1c83d312d117c1fc607000fc78e6a36660fec4e5

Author: Yuanjie Huang <yuanjie.huang at windriver.com>
Date:   Thu Sep 24 14:17:16 2015 +0800

gcc-multilib-config: Expand ccargs variable

The ccargs obtained from get_tune_parameters may not be fully expanded,
so that the gcc_multilib_setup function can be confused, and generates
invalid MULTILIB_OPTIONS in GCC Makefile fragment, which will break the
multilib feature of target gcc.

To address problems above, this patch modifies gcc_multilib_setup
function to expand ccargs before use.

Upstream-Status: Inappropriate [configuration]

Signed-off-by: Yuanjie Huang <yuanjie.huang at windriver.com>
Signed-off-by: Ross Burton <ross.burton at intel.com>

---

 meta/recipes-devtools/gcc/gcc-multilib-config.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-devtools/gcc/gcc-multilib-config.inc b/meta/recipes-devtools/gcc/gcc-multilib-config.inc
index f7f9f55..4a1010c 100644
--- a/meta/recipes-devtools/gcc/gcc-multilib-config.inc
+++ b/meta/recipes-devtools/gcc/gcc-multilib-config.inc
@@ -206,7 +206,7 @@ python gcc_multilib_setup() {
         # take out '-' mcpu='s and march='s from parameters
         opts = []
         whitelist = (d.getVar("MULTILIB_OPTION_WHITELIST", True) or "").split()
-        for i in tune_parameters['ccargs'].split():
+        for i in d.expand(tune_parameters['ccargs']).split():
             if i in whitelist:
                 # Need to strip '-' from option
                 opts.append(i[1:])