summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Jansa <martin.jansa@gmail.com>2014-01-18 15:01:52 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-01-21 10:20:12 +0000
commitcb714e13422229ab8a986063699e97bf13e55aa1 (patch)
tree24f73e83ba98fb483c56e583431817e8e2cd3b57
parenta7b97cbccceced9e38adf133bd4d80749213dbfc (diff)
downloadpoky-cb714e13422229ab8a986063699e97bf13e55aa1.tar.gz
icecc: use bb.utils.which also for 'as'
* it was introduced in commit 3a842ec52e7d010767b13bdcb5629ac07b3ee9e7 Author: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> Date: Fri Sep 16 10:55:16 2011 +0400 Subject: icecc.bbclass: replace with updated version without any explanation in which case ${ICECC_CC} -print-prog-name=as is returning as in current working directory, but will keep old behavior just in case (From OE-Core rev: 6092da20fc3ceb1bc6b4872ad16df565f05723b7) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/icecc.bbclass7
1 files changed, 6 insertions, 1 deletions
diff --git a/meta/classes/icecc.bbclass b/meta/classes/icecc.bbclass
index 5af764dddb..054e25c079 100644
--- a/meta/classes/icecc.bbclass
+++ b/meta/classes/icecc.bbclass
@@ -251,6 +251,8 @@ set_icecc_env() {
251 251
252 ICECC_CC="${@icc_get_and_check_tool(bb, d, "gcc")}" 252 ICECC_CC="${@icc_get_and_check_tool(bb, d, "gcc")}"
253 ICECC_CXX="${@icc_get_and_check_tool(bb, d, "g++")}" 253 ICECC_CXX="${@icc_get_and_check_tool(bb, d, "g++")}"
254 # cannot use icc_get_and_check_tool here because it assumes as without target_sys prefix
255 ICECC_WHICH_AS="${@bb.utils.which(os.getenv('PATH'), 'as')}"
254 if [ ! -x "${ICECC_CC}" -o ! -x "${ICECC_CXX}" ] 256 if [ ! -x "${ICECC_CC}" -o ! -x "${ICECC_CXX}" ]
255 then 257 then
256 bbwarn "Cannot use icecc: could not get ICECC_CC or ICECC_CXX" 258 bbwarn "Cannot use icecc: could not get ICECC_CC or ICECC_CXX"
@@ -266,9 +268,12 @@ set_icecc_env() {
266 fi 268 fi
267 269
268 ICECC_AS="`${ICECC_CC} -print-prog-name=as`" 270 ICECC_AS="`${ICECC_CC} -print-prog-name=as`"
271 # for target recipes should return something like:
272 # /OE/tmp-eglibc/sysroots/x86_64-linux/usr/libexec/arm920tt-oe-linux-gnueabi/gcc/arm-oe-linux-gnueabi/4.8.2/as
273 # and just "as" for native, if it returns "as" in current directory (for whatever reason) use "as" from PATH
269 if [ "`dirname "${ICECC_AS}"`" = "." ] 274 if [ "`dirname "${ICECC_AS}"`" = "." ]
270 then 275 then
271 ICECC_AS="`which as`" 276 ICECC_AS="${ICECC_WHICH_AS}"
272 fi 277 fi
273 278
274 if [ ! -f "${ICECC_VERSION}.done" ] 279 if [ ! -f "${ICECC_VERSION}.done" ]