Fix build with Java 8
Unlike later versions of Java, JDK 8 does not create the last directory segment pointed by the -d option, even if the other segments exist. So, create the "content" segment too and allow building with Java 8. Change-Id: Ie7ee75ca311270e02a3e1b6b5eeb28b5a1ccdad8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/169477 Tested-by: Jenkins Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
This commit is contained in:
parent
7d5c62537c
commit
dbfa56584c
1 changed files with 1 additions and 0 deletions
1
external/rhino/ExternalProject_rhino.mk
vendored
1
external/rhino/ExternalProject_rhino.mk
vendored
|
@ -17,6 +17,7 @@ $(call gb_ExternalProject_get_state_target,rhino,build) :
|
||||||
$(call gb_Trace_StartRange,rhino,EXTERNAL)
|
$(call gb_Trace_StartRange,rhino,EXTERNAL)
|
||||||
$(call gb_ExternalProject_run,build,\
|
$(call gb_ExternalProject_run,build,\
|
||||||
mkdir $(gb_UnpackedTarball_workdir)/rhino/build \
|
mkdir $(gb_UnpackedTarball_workdir)/rhino/build \
|
||||||
|
&& mkdir $(gb_UnpackedTarball_workdir)/rhino/build/content \
|
||||||
&& cd $(gb_UnpackedTarball_workdir)/rhino \
|
&& cd $(gb_UnpackedTarball_workdir)/rhino \
|
||||||
&& $(call gb_JavaClassSet_JAVACCOMMAND,$(JAVA_TARGET_VER)) $(gb_JavaClassSet_JAVACDEBUG) \
|
&& $(call gb_JavaClassSet_JAVACCOMMAND,$(JAVA_TARGET_VER)) $(gb_JavaClassSet_JAVACDEBUG) \
|
||||||
-d $(gb_UnpackedTarball_workdir)/rhino/build/content \
|
-d $(gb_UnpackedTarball_workdir)/rhino/build/content \
|
||||||
|
|
Loading…
Reference in a new issue