From 02eddf9a0b89b0cbe0c83d95cedb3431899197d0 Mon Sep 17 00:00:00 2001 From: Yuanjie Huang Date: Thu, 24 Sep 2015 14:17:16 +0800 Subject: 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 Signed-off-by: Ross Burton --- 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 f7f9f557db..4a1010ccf9 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:]) -- cgit 1.2.3-korg