From b28bae30fc5d8d1d7cc675ddb4159c39fb9bc3fd Mon Sep 17 00:00:00 2001 From: Tobias Henkel Date: Tue, 12 Nov 2013 09:34:01 +0100 Subject: icecc: Support shell evaluation of KERNEL_CC In the current implementation a KERNEL_CC variable containing shell evaluation breaks the build process. Shell expansion is not happening before general expansion in get_cross_kernel_cc which results in a syntax error and an aborted parse process. Before expanding the KERNEL_CC variable get_cross_kernel_cc now checks for backticks or '$(' in the KERNEL_CC variable and performs a shell evaluation using a call to echo if it finds one. Signed-off-by: Tobias Henkel Signed-off-by: Richard Purdie --- meta/classes/icecc.bbclass | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'meta/classes/icecc.bbclass') diff --git a/meta/classes/icecc.bbclass b/meta/classes/icecc.bbclass index 8655883d8a..31ad7a1691 100644 --- a/meta/classes/icecc.bbclass +++ b/meta/classes/icecc.bbclass @@ -41,7 +41,13 @@ def icecc_dep_prepend(d): DEPENDS_prepend += "${@icecc_dep_prepend(d)} " def get_cross_kernel_cc(bb,d): - kernel_cc = d.expand('${KERNEL_CC}') + kernel_cc = d.getVar('KERNEL_CC') + + # evaluate the expression by the shell if necessary + if '`' in kernel_cc or '$(' in kernel_cc: + kernel_cc = os.popen("echo %s" % kernel_cc).read()[:-1] + + kernel_cc = d.expand(kernel_cc) kernel_cc = kernel_cc.replace('ccache', '').strip() kernel_cc = kernel_cc.split(' ')[0] kernel_cc = kernel_cc.strip() -- cgit 1.2.3-korg