From f08ebc50e6567b25fd6abe68687ecd81fb23a664 Mon Sep 17 00:00:00 2001 From: Tobias Henkel Date: Fri, 15 Nov 2013 08:36:41 +0100 Subject: [PATCH] icecc: Use bb.utils.which instead of calling which The icecc class often calls 'which' for determining paths. This leads to many messages on stderr in case 'which' doesn't find the executable. Using bb.utils.which is more appropriate here and doesn't pollute stderr. (From OE-Core rev: 7ed7aa38182ce8c7300a08e3aefcc65da2b524a8) Signed-off-by: Tobias Henkel Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- meta/classes/icecc.bbclass | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meta/classes/icecc.bbclass b/meta/classes/icecc.bbclass index 1f53f85..49dbd77 100644 --- a/meta/classes/icecc.bbclass +++ b/meta/classes/icecc.bbclass @@ -55,7 +55,7 @@ def get_cross_kernel_cc(bb,d): return kernel_cc def get_icecc(d): - return d.getVar('ICECC_PATH') or os.popen("which icecc").read()[:-1] + return d.getVar('ICECC_PATH') or bb.utils.which(os.getenv("PATH"), "icecc") def create_path(compilers, bb, d): """ @@ -175,9 +175,9 @@ def icc_get_external_tool(bb, d, tool): def icc_get_tool(bb, d, tool): if icc_is_native(bb, d): - return os.popen("which %s" % tool).read()[:-1] + return bb.utils.which(os.getenv("PATH"), tool) elif icc_is_kernel(bb, d): - return os.popen("which %s" % get_cross_kernel_cc(bb, d)).read()[:-1] + return bb.utils.which(os.getenv("PATH"), get_cross_kernel_cc(bb, d)) else: ice_dir = d.expand('${STAGING_BINDIR_TOOLCHAIN}') target_sys = d.expand('${TARGET_SYS}') -- 2.7.4