diff options
| author | Jan-Marek Glogowski <glogow@fbihome.de> | 2020-09-12 03:15:35 +0200 |
|---|---|---|
| committer | Jan-Marek Glogowski <glogow@fbihome.de> | 2020-09-12 03:28:42 +0200 |
| commit | 0c31a0a5178b0ad1e10f55767ef98590f397a5e6 (patch) | |
| tree | 122e7d4c6dbccb3dc8137886c6d7eec8cb083087 /configure.ac | |
| parent | 3ad21220992e348ccfc59ce5ffb67ee9dd0e4b88 (diff) | |
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
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 6 |
1 files changed, 6 insertions, 0 deletions
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) |