You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@openoffice.apache.org by pe...@apache.org on 2018/10/15 21:08:27 UTC

svn commit: r1843953 - /openoffice/branches/AOO416/main/solenv/inc/tg_compv.mk

Author: pescetti
Date: Mon Oct 15 21:08:26 2018
New Revision: 1843953

URL: http://svn.apache.org/viewvc?rev=1843953&view=rev
Log:
Allow building when gcc -dumpversion does not use the canonical x.y.z format #i127712#
Patch-by: Ash

Modified:
    openoffice/branches/AOO416/main/solenv/inc/tg_compv.mk

Modified: openoffice/branches/AOO416/main/solenv/inc/tg_compv.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/AOO416/main/solenv/inc/tg_compv.mk?rev=1843953&r1=1843952&r2=1843953&view=diff
==============================================================================
--- openoffice/branches/AOO416/main/solenv/inc/tg_compv.mk (original)
+++ openoffice/branches/AOO416/main/solenv/inc/tg_compv.mk Mon Oct 15 21:08:26 2018
@@ -31,10 +31,10 @@ COMPVERMK:=$(SOLARINCDIR)/comp_ver.mk
 COMNAME:=
 
 .IF "$(COM)"=="GCC"
-CFLAGSVERSION=-dumpversion
-CFLAGSVERSION_CMD=-dumpversion
-CFLAGSNUMVERSION_CMD=-dumpversion $(PIPEERROR) $(AWK) -v num=true -f $(SOLARENV)/bin/getcompver.awk
-#CFLAGSNUMVERSION_CMD=-dumpversion | 2>&1  $(AWK) -v num=true -f $(SOLARENV)/bin/getcompver.awk
+CFLAGSVERSION=-dumpfullversion -dumpversion
+CFLAGSVERSION_CMD=-dumpfullversion -dumpversion
+CFLAGSNUMVERSION_CMD=-dumpfullversion -dumpversion $(PIPEERROR) $(AWK) -v num=true -f $(SOLARENV)/bin/getcompver.awk
+#CFLAGSNUMVERSION_CMD=-dumpfullversion -dumpversion | 2>&1  $(AWK) -v num=true -f $(SOLARENV)/bin/getcompver.awk
 .ELIF "$(COM)"=="CLANG"
 CFLAGSVERSION=--version
 CFLAGSVERSION_CMD=--version | head -n1 | sed -e"s/.*version //" -e"s/ .*//"