Author: hdu
Date: Thu Jan 23 17:05:32 2014
New Revision: 1560754
URL: http://svn.apache.org/r1560754
Log:
#i121715# do not enable java's -d32 option on 32bit capable jre
merged from revision 1560617 in branch rejuvenate01
Modified:
openoffice/trunk/main/configure.in
Modified: openoffice/trunk/main/configure.in
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/configure.in?rev=1560754&r1=1560753&r2=1560754&view=diff
==============================================================================
--- openoffice/trunk/main/configure.in (original)
+++ openoffice/trunk/main/configure.in Thu Jan 23 17:05:32 2014
@@ -2933,16 +2933,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
