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 /solenv/gbuild/Jar.mk | |
| 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 'solenv/gbuild/Jar.mk')
| -rw-r--r-- | solenv/gbuild/Jar.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/solenv/gbuild/Jar.mk b/solenv/gbuild/Jar.mk index 1bbfeca166eb..9592fbbad6a6 100644 --- a/solenv/gbuild/Jar.mk +++ b/solenv/gbuild/Jar.mk @@ -64,7 +64,7 @@ define gb_Jar__command $(gb_Jar_JARCOMMAND) cfm $(2) $(call gb_Jar_get_manifest_target,$(1)) \ META-INF $(PACKAGEROOTS) $(PACKAGEFILES) \ $(foreach root,$(PACKAGEDIRS),&& cd $(dir $(root)) && $(gb_Jar_JARCOMMAND) uf $(2) $(notdir $(root))) \ - || (rm $(2); false) ) + || (rm -f $(2); false) ) endef # clean target reuses clean target of ClassSet |