Mesa (master): configure.ac: Fix build with git-svn llvm version string

Tom Stellard tstellar at kemper.freedesktop.org
Tue Sep 9 13:47:46 UTC 2014


Module: Mesa
Branch: master
Commit: 181581280bd430d122d416e308c1de82db82da04
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=181581280bd430d122d416e308c1de82db82da04

Author: Tom Stellard <thomas.stellard at amd.com>
Date:   Tue Sep  9 07:04:20 2014 -0400

configure.ac: Fix build with git-svn llvm version string

Reviewed-and-tested-by: Jan Vesely <jan.vesely at rutgers.edu>

---

 configure.ac |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index be85fd5..176c220 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1687,7 +1687,7 @@ if test "x$enable_gallium_llvm" = xyes; then
     fi
 
     if test "x$LLVM_CONFIG" != xno; then
-        LLVM_VERSION=`$LLVM_CONFIG --version | sed 's/svn.*//g'`
+        LLVM_VERSION=`$LLVM_CONFIG --version | grep -o '^[[0-9.]]\+'`
         LLVM_LDFLAGS=`$LLVM_CONFIG --ldflags`
         LLVM_BINDIR=`$LLVM_CONFIG --bindir`
         LLVM_CPPFLAGS=`strip_unwanted_llvm_flags "$LLVM_CONFIG --cppflags"`




More information about the mesa-commit mailing list