diff options
| author | Jan-Marek Glogowski <glogow@fbihome.de> | 2020-07-29 12:04:03 +0200 |
|---|---|---|
| committer | Jan-Marek Glogowski <glogow@fbihome.de> | 2020-09-11 20:29:11 +0200 |
| commit | 42aeb9f906ca4e23d118ff8563184f9315ef3b82 (patch) | |
| tree | 55e623dda2192f7d613b03b47b89413f5222dd89 /config_host.mk.in | |
| parent | 0b99cceb5273550dbaef5890297fd7ebfccd6817 (diff) | |
cross-build: fix Java NI linking
LibreOffice has a JNI component on Windows and Linux, the
officebean. Therefore we need a host JDK for linkage to the
jawt, and a build JDK to compile the Java code.
Change-Id: I4138628ab3ea2ef5900a5b4e9281050ae84e4eb5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102483
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
Diffstat (limited to 'config_host.mk.in')
| -rw-r--r-- | config_host.mk.in | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/config_host.mk.in b/config_host.mk.in index e3014b015a48..6cea6ccf795e 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -267,7 +267,6 @@ export HARFBUZZ_LIBS=$(gb_SPACE)@HARFBUZZ_LIBS@ export GSSAPI_LIBS=@GSSAPI_LIBS@ export GSTREAMER_1_0_CFLAGS=$(gb_SPACE)@GSTREAMER_1_0_CFLAGS@ export GSTREAMER_1_0_LIBS=$(gb_SPACE)@GSTREAMER_1_0_LIBS@ -export GTHREAD_CFLAGS=$(gb_SPACE)@GTHREAD_CFLAGS@ export GTK3_CFLAGS=$(gb_SPACE)@GTK3_CFLAGS@ export GTK3_LIBS=$(gb_SPACE)@GTK3_LIBS@ export USING_X11=@USING_X11@ @@ -320,15 +319,18 @@ export IWYU_PATH=@IWYU_PATH@ export JAVACOMPILER=@JAVACOMPILER@ export JAVADOC=@JAVADOC@ export JAVADOCISGJDOC=@JAVADOCISGJDOC@ -export JAVAFLAGS=@JAVAFLAGS@ +export JAVACFLAGS=@JAVACFLAGS@ export JAVAIFLAGS=@JAVAIFLAGS@ +export JAVAIFLAGS_FOR_BUILD=@JAVAIFLAGS@ export JAVA_CLASSPATH_NOT_SET=@JAVA_CLASSPATH_NOT_SET@ export JAVAINTERPRETER=@JAVAINTERPRETER@ export JAVA_HOME=@JAVA_HOME@ +export JAVA_HOME_FOR_BUILD=@JAVA_HOME_FOR_BUILD@ export JAVA_SOURCE_VER=@JAVA_SOURCE_VER@ export JAVA_TARGET_VER=@JAVA_TARGET_VER@ export JAWTLIB=@JAWTLIB@ export JDK=@JDK@ +export JDK_FOR_BUILD=@JDK_FOR_BUILD@ export JFREEREPORT_JAR=@JFREEREPORT_JAR@ export JITC_PROCESSOR_TYPE=@JITC_PROCESSOR_TYPE@ export JVM_ONE_PATH_CHECK=@JVM_ONE_PATH_CHECK@ |