From: Julian Seward <jseward@acm.org>
Date: Thu, 29 Sep 2011 18:18:37 +0000 (+0000)
Subject: Un-break the compiler version check on Darwin (introduced by r12066)
X-Git-Tag: svn/VALGRIND_3_7_0~168
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e3b8fb9ac18288df4629286074f633ab9351ae14;p=thirdparty%2Fvalgrind.git

Un-break the compiler version check on Darwin (introduced by r12066)
without (hopefully) breaking it on any other platform.


git-svn-id: svn://svn.valgrind.org/valgrind/trunk@12069
---

diff --git a/configure.in b/configure.in
index 7dea144047..9d55d26ffb 100644
--- a/configure.in
+++ b/configure.in
@@ -98,7 +98,18 @@ rm $tmpfile
 # We don't want gcc < 3.0
 AC_MSG_CHECKING([for a supported version of gcc])
 
-[gcc_version=`${CC} --version | head -n 1 | $SED 's/^[^0-9]*\([0-9.]*\).*$/\1/'`]
+# Try to get the gcc version, sed-ing out some unexpected stuff
+# that appears with the default gcc on OSX 10.6 and 10.7 respectively.
+# Without this, the version number comes out as 686, 10 or 11 :-(
+# 
+# i686-apple-darwin10-gcc-4.2.1 (GCC) 4.2.1 (Apple Inc. build 5666) (dot 3)
+# i686-apple-darwin11-llvm-gcc-4.2 (GCC) 4.2.1 (Based on Apple Inc. build 5658) (LLVM build 2335.15.00)
+#
+[gcc_version=`${CC} --version \
+             | head -n 1 \
+             | $SED 's/i686-apple-darwin10//' \
+             | $SED 's/i686-apple-darwin11//' \
+             | $SED 's/^[^0-9]*\([0-9.]*\).*$/\1/'`]
 
 is_clang="notclang"
 if test "x`${CC} --version | head -n 1 | $SED 's/\(clang\) version.*/\1/'`" = "xclang" ; then