openoffice-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Don Lewis <truck...@apache.org>
Subject Re: svn commit: r1827215 - in /openoffice/trunk/main: configure.ac solenv/gbuild/platform/macosx.mk
Date Mon, 19 Mar 2018 22:47:49 GMT
On 19 Mar, jim@apache.org wrote:
> Author: jim
> Date: Mon Mar 19 16:53:04 2018
> New Revision: 1827215
> 
> URL: http://svn.apache.org/viewvc?rev=1827215&view=rev
> Log:
> Use gcc3 for COMID for macOS/OSX
> 
> 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=1827215&r1=1827214&r2=1827215&view=diff
> ==============================================================================
> --- openoffice/trunk/main/configure.ac (original)
> +++ openoffice/trunk/main/configure.ac Mon Mar 19 16:53:04 2018
> @@ -2237,13 +2237,8 @@ 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/\.//";
> -		if test "$build_os" == "darwin"; then
> -			COMID="s5abi";
> -			COMNAME="s5abi";
> -		else
> -			COMID="gcc3";
> -			COMNAME="gcc3";
> -		fi;;
> +		COMID="gcc3";
> +		COMNAME="gcc3";
>  	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=1827215&r1=1827214&r2=1827215&view=diff
> ==============================================================================
> --- openoffice/trunk/main/solenv/gbuild/platform/macosx.mk (original)
> +++ openoffice/trunk/main/solenv/gbuild/platform/macosx.mk Mon Mar 19 16:53:04 2018
> @@ -22,8 +22,6 @@
>  
>  
>  GUI := UNX
> -COM := S5ABI
> -COMID := s5abi
>  #COM := S5ABI
>  #COMID := s5abi
>  
> 
> 

I don't think this is correct.  As I recall the bridges code for Mac
uses s5abi.


Mime
View raw message