Kaydet (Commit) 8028df6f authored tarafından Herbert Dürr's avatar Herbert Dürr

#i121715# do not enable java's -d32 option on 32bit capable jre

merged from revision 1560617 in branch rejuvenate01
üst c389daff
...@@ -2933,16 +2933,7 @@ if test "$SOLAR_JAVA" != ""; then ...@@ -2933,16 +2933,7 @@ if test "$SOLAR_JAVA" != ""; then
JAVAINTERPRETER=`cygpath -d "$JAVAINTERPRETER"` JAVAINTERPRETER=`cygpath -d "$JAVAINTERPRETER"`
JAVAINTERPRETER=`cygpath -u "$JAVAINTERPRETER"` JAVAINTERPRETER=`cygpath -u "$JAVAINTERPRETER"`
elif test "$_os" = "Darwin"; then elif test "$_os" = "Darwin"; then
dnl HACK: There currently is only a 32 bit version of OOo for Mac OS X, JAVAIFLAGS=""
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
fi fi
fi fi
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment