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 /external/hsqldb | |
| 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 'external/hsqldb')
| -rw-r--r-- | external/hsqldb/ExternalProject_hsqldb.mk | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/external/hsqldb/ExternalProject_hsqldb.mk b/external/hsqldb/ExternalProject_hsqldb.mk index d253334549b7..4d5f5f8786f0 100644 --- a/external/hsqldb/ExternalProject_hsqldb.mk +++ b/external/hsqldb/ExternalProject_hsqldb.mk @@ -16,6 +16,7 @@ $(eval $(call gb_ExternalProject_register_targets,hsqldb,\ $(call gb_ExternalProject_get_state_target,hsqldb,build) : $(call gb_Trace_StartRange,hsqldb,EXTERNAL) $(call gb_ExternalProject_run,build,\ + JAVA_HOME=$(JAVA_HOME_FOR_BUILD) \ $(ICECREAM_RUN) "$(ANT)" \ $(if $(verbose),-v,-q) \ -f build/build.xml \ |