diff options
author | Yuanjie Huang <yuanjie.huang@windriver.com> | 2015-09-24 14:17:16 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-09-28 12:00:29 +0100 |
commit | 218d9f480f29e971379b2bd65a257aed94db3334 (patch) | |
tree | 1833d1703f44ac55bc62cea1bfe257a642d15b83 /meta/recipes-devtools | |
parent | be13cdb5f616927e611f61b3ee03fce44e4f4b68 (diff) | |
download | poky-218d9f480f29e971379b2bd65a257aed94db3334.tar.gz |
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]
(From OE-Core rev: 02eddf9a0b89b0cbe0c83d95cedb3431899197d0)
Signed-off-by: Yuanjie Huang <yuanjie.huang@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r-- | meta/recipes-devtools/gcc/gcc-multilib-config.inc | 2 |
1 files changed, 1 insertions, 1 deletions
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() { | |||
206 | # take out '-' mcpu='s and march='s from parameters | 206 | # take out '-' mcpu='s and march='s from parameters |
207 | opts = [] | 207 | opts = [] |
208 | whitelist = (d.getVar("MULTILIB_OPTION_WHITELIST", True) or "").split() | 208 | whitelist = (d.getVar("MULTILIB_OPTION_WHITELIST", True) or "").split() |
209 | for i in tune_parameters['ccargs'].split(): | 209 | for i in d.expand(tune_parameters['ccargs']).split(): |
210 | if i in whitelist: | 210 | if i in whitelist: |
211 | # Need to strip '-' from option | 211 | # Need to strip '-' from option |
212 | opts.append(i[1:]) | 212 | opts.append(i[1:]) |