diff options
| -rwxr-xr-x | configure | 13 | ||||
| -rw-r--r-- | configure.in | 12 | ||||
| -rw-r--r-- | set_soenv.in | 1 | ||||
| -rw-r--r-- | solenv/config/ssolar.cmn | 1 | ||||
| -rw-r--r-- | solenv/inc/unxmacx.mk | 1 |
5 files changed, 27 insertions, 1 deletions
diff --git a/configure b/configure index 914db32ad674..b552fb9adac1 100755 --- a/configure +++ b/configure @@ -877,6 +877,7 @@ DPKG EPM BUILD_DMAKE DMAKE +JAVAIFLAGS JAVAFLAGS JDK JAVA_HOME @@ -11853,6 +11854,17 @@ $as_echo "$as_me: error: $_java_path not found set with_jdk_home" >&2;} fi JAVAINTERPRETER=`cygpath -d "$JAVAINTERPRETER"` JAVAINTERPRETER=`cygpath -u "$JAVAINTERPRETER"` + elif test "$_os" = "Darwin"; then + { $as_echo "$as_me:$LINENO: checking whether to pass -d32 to Java interpreter" >&5 +$as_echo_n "checking whether to pass -d32 to Java interpreter... " >&6; } + if "$JAVAINTERPRETER" -d32 >&5 2>&5; then + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } + JAVAIFLAGS=-d32 + else + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } + fi fi fi @@ -12889,6 +12901,7 @@ fi + # Extract the first word of "dmake", so it can be a program name with args. set dummy dmake; ac_word=$2 { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 diff --git a/configure.in b/configure.in index 29cbb5ff60df..8ea1f00cbe86 100644 --- a/configure.in +++ b/configure.in @@ -2704,6 +2704,17 @@ if test "$SOLAR_JAVA" != ""; then fi 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 fi fi @@ -3086,6 +3097,7 @@ AC_SUBST(JAVA_HOME) AC_SUBST(JDK) AC_SUBST(JAVAFLAGS) AC_SUBST(JAVAINTERPRETER) +AC_SUBST(JAVAIFLAGS) AC_SUBST(JAVACOMPILER) AC_SUBST(JAVAAOTCOMPILER) AC_SUBST(JAVADOC) diff --git a/set_soenv.in b/set_soenv.in index 77c671ecb661..5c6413ad5d6d 100644 --- a/set_soenv.in +++ b/set_soenv.in @@ -1700,6 +1700,7 @@ if ( '@JDK@' ne '' ) ToFile( "JDK", "@JDK@", "e" ); ToFile( "JAVAFLAGS", "@JAVAFLAGS@", "e" ); ToFile( "JAVAINTERPRETER", PathFormat("@JAVAINTERPRETER@"), "e" ); + ToFile( "JAVAIFLAGS", "@JAVAIFLAGS@", "e" ); ToFile( "JAVACOMPILER", PathFormat("@JAVACOMPILER@"), "e" ); ToFile( "JAVAAOTCOMPILER", PathFormat("@JAVAAOTCOMPILER@"), "e" ); ToFile( "JAVADOC", PathFormat("@JAVADOC@"), "e" ); diff --git a/solenv/config/ssolar.cmn b/solenv/config/ssolar.cmn index ab95e3419350..cbcdbb88078c 100644 --- a/solenv/config/ssolar.cmn +++ b/solenv/config/ssolar.cmn @@ -267,6 +267,7 @@ common HAVE_LD_HASH_STYLE JAVACOMPILER JAVADOC + JAVAIFLAGS JDK NO_HIDS PAM_LINK diff --git a/solenv/inc/unxmacx.mk b/solenv/inc/unxmacx.mk index 27000d2768fc..6f327adb43dd 100644 --- a/solenv/inc/unxmacx.mk +++ b/solenv/inc/unxmacx.mk @@ -74,7 +74,6 @@ SOLAR_JAVA*=TRUE JAVADEF=-DSOLAR_JAVA JAVAFLAGSDEBUG=-g JAVA_RUNTIME=-framework JavaVM - JAVAIFLAGS=-d32 .ENDIF # architecture dependent flags for the C and C++ compiler that can be changed by |