[Libreoffice-commits] core.git: configure.ac

Lionel Elie Mamane lionel at mamane.lu
Fri Aug 9 01:21:54 PDT 2013


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

New commits:
commit 24de9f9a55b5b73a1c7bb863e4487d6349142cfc
Author: Lionel Elie Mamane <lionel at mamane.lu>
Date:   Fri Aug 9 10:21:10 2013 +0200

    $CC --version for CLang
    
    Has only two components, e.g. 4.1
    
    Change-Id: I255a5a3e240f41d39ee88c4be0c714e29db75a6a

diff --git a/configure.ac b/configure.ac
index 7dc6252..3660ace 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2929,7 +2929,7 @@ dnl  Test the gcc version
 dnl ===================================================================
 if test "$GCC" = "yes"; then
     AC_MSG_CHECKING([the GCC version])
-    _gcc_version=$($CC --version|head -n1|sed -e 's/^.*[^[:digit:]]\(\([[:digit:]]\+\.\)\{2\}[[:digit:]]\+\).*/\1/')
+    _gcc_version=$($CC --version|head -n1|sed -e 's/^.*[^.[:digit:]]\(\([[:digit:]]\+\.\)\{1,2\}[[:digit:]]\+\).*/\1/')
     _gcc_major=`echo $_gcc_version | $AWK -F. '{ print \$1 }'`
     GCCVER=`echo $_gcc_version | $AWK -F. '{ print \$1*10000+\$2*100+\$3 }'`
 


More information about the Libreoffice-commits mailing list