[oe-commits] [openembedded-core] 08/27: kernel.bbclass: external toolchain fix

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master-next
in repository openembedded-core.

commit d299f66f8877a7c9ad8550ee7d95f1b7a783b07d
Author: Juro Bystricky <juro.bystricky at intel.com>
AuthorDate: Sat Aug 19 09:41:35 2017 -0700

    kernel.bbclass: external toolchain fix
    
    Refactor get_cc_option so it is simpler and also does not fail
    when using external toolchain.
    
    Signed-off-by: Juro Bystricky <juro.bystricky at intel.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 meta/classes/kernel.bbclass | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
index 2a76554..3cc0432 100644
--- a/meta/classes/kernel.bbclass
+++ b/meta/classes/kernel.bbclass
@@ -259,12 +259,9 @@ get_cc_option () {
 		# Check if KERNEL_CC supports the option "file-prefix-map".
 		# This option allows us to build images with __FILE__ values that do not
 		# contain the host build path.
-		cc_option_supported=`${KERNEL_CC} -Q --help=joined | grep ffile-prefix-map`
-		cc_extra=""
-		if [ $cc_option_supported = "-ffile-prefix-map=<old=new>" ]; then
-			cc_extra=-ffile-prefix-map=${S}=/kernel-source/
+		if ${KERNEL_CC} -Q --help=joined | grep -q "\-ffile-prefix-map=<old=new>"; then
+			echo "-ffile-prefix-map=${S}=/kernel-source/"
 		fi
-		echo $cc_extra
 }
 
 kernel_do_compile() {

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.