openoffice-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From h..@apache.org
Subject svn commit: r1560617 - /openoffice/branches/rejuvenate01/main/configure.in
Date Thu, 23 Jan 2014 09:46:40 GMT
Author: hdu
Date: Thu Jan 23 09:46:40 2014
New Revision: 1560617

URL: http://svn.apache.org/r1560617
Log:
#i121715# do not enable java's -d32 option on 32bit capable jre

Modified:
    openoffice/branches/rejuvenate01/main/configure.in

Modified: openoffice/branches/rejuvenate01/main/configure.in
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/configure.in?rev=1560617&r1=1560616&r2=1560617&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/configure.in (original)
+++ openoffice/branches/rejuvenate01/main/configure.in Thu Jan 23 09:46:40 2014
@@ -2973,16 +2973,7 @@ if test "$SOLAR_JAVA" != ""; then
       JAVAINTERPRETER=`cygpath -d "$JAVAINTERPRETER"`
       JAVAINTERPRETER=`cygpath -u "$JAVAINTERPRETER"`
    elif test "$_os" = "Darwin"; then
-      dnl HACK:  There currently is only a 32 bit version of OOo for Mac OS X,
-      dnl and Tiger java complains about -d32 while Snow Leopard java needs it
-      dnl to run in 32 bit mode and be able to load OOo jnilibs:
-      AC_MSG_CHECKING([whether to pass -d32 to Java interpreter])
-      if "$JAVAINTERPRETER" -d32 >&5 2>&5; then
-         AC_MSG_RESULT([yes])
-         JAVAIFLAGS=-d32
-      else
-         AC_MSG_RESULT([no])
-      fi
+         JAVAIFLAGS=""
    fi
 fi
 



Mime
View raw message