openoffice-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j..@apache.org
Subject svn commit: r1827253 - in /openoffice/trunk/main: configure.ac solenv/gbuild/platform/macosx.mk
Date Tue, 20 Mar 2018 00:15:52 GMT
Author: jim
Date: Tue Mar 20 00:15:51 2018
New Revision: 1827253

URL: http://svn.apache.org/viewvc?rev=1827253&view=rev
Log:
Pattern match and back to s5abi for now...

Modified:
    openoffice/trunk/main/configure.ac
    openoffice/trunk/main/solenv/gbuild/platform/macosx.mk

Modified: openoffice/trunk/main/configure.ac
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/configure.ac?rev=1827253&r1=1827252&r2=1827253&view=diff
==============================================================================
--- openoffice/trunk/main/configure.ac (original)
+++ openoffice/trunk/main/configure.ac Tue Mar 20 00:15:51 2018
@@ -2237,9 +2237,16 @@ case $COM in
 		CCNUMVER=`echo ${CCVER} | $AWK -v num=true -f ${_solenv}/bin/getcompver.awk`;
 		# The version in tg_compv.mk for darwin does not look correct
 		# CCNUMVER = `echo ${CCVER} | sed -e"s/\.//";
-		COMID="gcc3";
-		COMNAME="gcc3";
-		;;
+		case "$build_os" in
+			darwin*) # Mac OS X
+				COMID="s5abi";
+				COMNAME="s5abi";
+				;;
+			*)
+				COMID="gcc3";
+				COMNAME="gcc3";
+				;;
+		esac
 	MSC)
 		CCVER=`${CC} 2>&1 | $AWK -f ${_solenv}/bin/getcompver.awk`;
 		CCNUMVER=`${CC} 2>&1 | $AWK -v num=true -f ${_solenv}/bin/getcompver.awk`;

Modified: openoffice/trunk/main/solenv/gbuild/platform/macosx.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/gbuild/platform/macosx.mk?rev=1827253&r1=1827252&r2=1827253&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/gbuild/platform/macosx.mk (original)
+++ openoffice/trunk/main/solenv/gbuild/platform/macosx.mk Tue Mar 20 00:15:51 2018
@@ -23,7 +23,7 @@
 
 GUI := UNX
 #COM := S5ABI
-#COMID := s5abi
+COMID := s5abi
 
 # Darwin mktemp -t expects a prefix, not a pattern
 gb_MKTEMP ?= /usr/bin/mktemp -t gbuild.



Mime
View raw message