strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Improve build-time Java checks when cross-compiling from MacOSX

Browse source
This commit is contained in:
Tor Lillqvist 2011-11-25 00:41:00 +02:00
parent 53e9130dd2
commit 82a8643ba6
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
configure.in
View file

@ -4197,7 +4197,7 @@ if test "$SOLAR_JAVA" != ""; then
fi
dnl now that we have the path to the real javac, make a JAVA_HOME out of it..
if test "$JAVA_HOME" != "/usr"; then
if test "$_os" = "Darwin"; then
if test "$_os" = "Darwin" -o "$OS_FOR_BUILD" = MACOSX; then
dnl Leopard returns a non-suitable path with readlink - points to "Current" only
JAVA_HOME=$(echo $JAVA_HOME | $SED -e s,/Current/Commands/javac$,/CurrentJDK/Home,)
dnl Tiger already returns a JDK path..
@ -4254,7 +4254,7 @@ _ACEOF
dnl second sanity check JAVA_HOME if possible
if test "$JDK" != "gcj" -o "$_gij_longver" -ge "40200"; then
# now check if $JAVA_HOME is really valid
if test "$_os" = "Darwin"; then
if test "$_os" = "Darwin" -o "$OS_FOR_BUILD" = MACOSX; then
if test ! -f "$JAVA_HOME/lib/jvm.cfg" -a "x$with_jdk_home" = "x"; then
JAVA_HOME_OK="NO"
fi