diff options
| -rw-r--r-- | config_host.mk.in | 2 | ||||
| -rw-r--r-- | configure.ac | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/config_host.mk.in b/config_host.mk.in index 6cea6ccf795e..b0594a06f949 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -321,7 +321,7 @@ export JAVADOC=@JAVADOC@ export JAVADOCISGJDOC=@JAVADOCISGJDOC@ export JAVACFLAGS=@JAVACFLAGS@ export JAVAIFLAGS=@JAVAIFLAGS@ -export JAVAIFLAGS_FOR_BUILD=@JAVAIFLAGS@ +export JAVAIFLAGS_FOR_BUILD=@JAVAIFLAGS_FOR_BUILD@ export JAVA_CLASSPATH_NOT_SET=@JAVA_CLASSPATH_NOT_SET@ export JAVAINTERPRETER=@JAVAINTERPRETER@ export JAVA_HOME=@JAVA_HOME@ diff --git a/configure.ac b/configure.ac index 06398bfa99a7..c5ab4159e17f 100644 --- a/configure.ac +++ b/configure.ac @@ -7901,7 +7901,7 @@ fi AC_SUBST(JAVADOC) AC_SUBST(JAVADOCISGJDOC) -if test "$ENABLE_JAVA" != ""; then +if test "$ENABLE_JAVA" != "" -a \( "$cross_compiling" != "yes" -o -n "$with_jdk_home" \); then # check if JAVA_HOME was (maybe incorrectly?) set automatically to /usr if test "$JAVA_HOME" = "/usr" -a "x$with_jdk_home" = "x"; then if basename $(readlink $(readlink $JAVACOMPILER)) >/dev/null 2>/dev/null; then |