You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ms...@apache.org on 2018/11/12 12:03:05 UTC
svn commit: r1846401 - /openoffice/trunk/main/configure.ac
Author: mseidel
Date: Mon Nov 12 12:03:05 2018
New Revision: 1846401
URL: http://svn.apache.org/viewvc?rev=1846401&view=rev
Log:
i127712 - Allow building when gcc -dumpversion does not use the canonical x.y.z format
Patch by: Arrigo Marchiori
Thank you for your contribution!
Modified:
openoffice/trunk/main/configure.ac
Modified: openoffice/trunk/main/configure.ac
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/configure.ac?rev=1846401&r1=1846400&r2=1846401&view=diff
==============================================================================
--- openoffice/trunk/main/configure.ac (original)
+++ openoffice/trunk/main/configure.ac Mon Nov 12 12:03:05 2018
@@ -2220,7 +2220,7 @@ AC_SUBST(COM)
dnl Decode the compiler version. Logic from main/solenv/inc/tg_compv.mk.
case $COM in
GCC)
- CCVER=`${CC} -dumpversion 2>&1`;
+ CCVER=`${CC} -dumpfullversion -dumpversion 2>&1`;
CCNUMVER=`echo ${CCVER} | $AWK -v num=true -f ${_solenv}/bin/getcompver.awk`;
if test "${CCNUMVER}" -ge 000300000001; then
COMID="gcc3";