diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-15 09:44:47 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-15 09:44:47 +0000 |
| commit | 91fe6b97952aa6f7cef58327fd085a17db38ad95 (patch) | |
| tree | 7a4412295bfb80e15a4936fe67d4bd7b96458ce8 /solenv/gbuild/JavaClassSet.mk | |
| parent | Releasing progress-linux version 4:24.2.1-4~progress7.99u1. (diff) | |
| download | libreoffice-91fe6b97952aa6f7cef58327fd085a17db38ad95.tar.xz libreoffice-91fe6b97952aa6f7cef58327fd085a17db38ad95.zip | |
Merging upstream version 4:24.2.2.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to '')
| -rw-r--r-- | solenv/gbuild/JavaClassSet.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/solenv/gbuild/JavaClassSet.mk b/solenv/gbuild/JavaClassSet.mk index 84fbcc13c3..8acf120dd6 100644 --- a/solenv/gbuild/JavaClassSet.mk +++ b/solenv/gbuild/JavaClassSet.mk @@ -19,7 +19,7 @@ gb_JavaClassSet_JAVACCOMMAND = $(ICECREAM_RUN) $(JAVACOMPILER) $(JAVACFLAGS) \ -encoding utf8 \ - --release $(1) \ + $(if $(MODULAR_JAVA),--release $(1),-source $(1) -target $(1)) \ -Xlint:-options \ -Xlint:unchecked @@ -51,7 +51,7 @@ $(call gb_Helper_abbreviate_dirs,\ -d $(call gb_JavaClassSet_get_classdir,$(2)) \ @$$RESPONSEFILE &&) \ rm -f $$RESPONSEFILE &&) \ - $(if $(T_MODULENAME),\ + $(if $(MODULAR_JAVA),$(if $(T_MODULENAME),\ RESPONSEFILE=$(call gb_var2file,$(shell $(gb_MKTEMP)),\ $(T_JAVA9FILES)) && \ $(if $(3),$(call gb_JavaClassSet_JAVACCOMMAND,9) \ @@ -61,7 +61,7 @@ $(call gb_Helper_abbreviate_dirs,\ $(if $(T_MODULENAME),--patch-module $(T_MODULENAME)="$(subst $(WHITESPACE),$(gb_CLASSPATHSEP),$(strip $(dir $(PACKAGEDIRS))))") \ -d $(call gb_JavaClassSet_get_classdir,$(2)) \ @$$RESPONSEFILE &&) \ - rm -f $$RESPONSEFILE &&) \ + rm -f $$RESPONSEFILE &&)) \ touch $(1)) endef |