[coreboot-gerrit] New patch to review for coreboot: buildgcc: Update clang search string

Marc Jones (marc.jones@se-eng.com) gerrit at coreboot.org
Thu Jun 18 00:03:52 CEST 2015


Marc Jones (marc.jones at se-eng.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/10569

-gerrit

commit 93c9ea7fb4bccc7cf36cfc45cf8b7aec24e97015
Author: Marc Jones <marc.jones at se-eng.com>
Date:   Wed Jun 17 15:38:17 2015 -0600

    buildgcc: Update clang search string
    
    buildgcc fails if g++ or clang isn't found on the host. This
    was failing on OSX due to the string used to check for clang
    doesn't match "Apple LLVM". Add an additional search string for
    clang "LLVM".
    
    Change-Id: I05e36cfc690061b3233376d57f44f197cab933ea
    Signed-off-by: Marc Jones <marc.jones at se-eng.com>
---
 util/crossgcc/buildgcc | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/util/crossgcc/buildgcc b/util/crossgcc/buildgcc
index 657df2c..e42d43e 100755
--- a/util/crossgcc/buildgcc
+++ b/util/crossgcc/buildgcc
@@ -169,6 +169,17 @@ searchtool()
 			fi
 		fi
 	fi
+	# A workaround for OSX other OS where clang has "LLVM" in the
+	# the version string.
+	if [ "$1" = "clang" ]; then
+		if [ -x "$(which $1 2>/dev/null)" ]; then
+			if [ "$(cat /dev/null | $1 --version 2>&1 | grep -c "LLVM")" \
+			    -gt 0 ]; then
+				echo $i
+				return
+			fi
+		fi
+	fi
 	please_install $1
 	[ -z "$3" ] && exit 1
 	false



More information about the coreboot-gerrit mailing list