[Libreoffice-commits] core.git: configure.ac

[Jan-Marek Glogowski (via logerrit)]

 configure.ac |    6 ++++++
 1 file changed, 6 insertions(+)

New commits:
commit 0c31a0a5178b0ad1e10f55767ef98590f397a5e6
Author:     Jan-Marek Glogowski <glogow at fbihome.de>
AuthorDate: Sat Sep 12 03:15:35 2020 +0200
Commit:     Jan-Marek Glogowski <glogow at fbihome.de>
CommitDate: Sat Sep 12 03:28:42 2020 +0200

    non-cross: set Java FOR_BUILD variables
    
    Seems I never had some JAVA_HOME ponting to some different Java,
    then my build system. At least that is my guess from the
    lo_callgrind_linux Jenkins build.
    
    Change-Id: I4315ff64064463edf34f0f96006ae72f80f1ffa4

diff --git a/configure.ac b/configure.ac
index 7dba20926e8e..8e8d5eb662d9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8126,6 +8126,12 @@ if test -n "$ENABLE_JAVA" -a -z "$JAVAINC"; then
 fi
 SOLARINC="$SOLARINC $JAVAINC"
 
+if test "$ENABLE_JAVA" != "" -a "$cross_compiling" != "yes"; then
+    JAVA_HOME_FOR_BUILD=$JAVA_HOME
+    JAVAIFLAGS_FOR_BUILD=$JAVAIFLAGS
+    JDK_FOR_BUILD=$JDK
+fi
+
 AC_SUBST(JAVACFLAGS)
 AC_SUBST(JAVACOMPILER)
 AC_SUBST(JAVAINTERPRETER)