diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-15 09:43:56 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-15 09:43:56 +0000 |
| commit | 030eda2c4d6cad6d44c35499bcfc43ba89c88bb9 (patch) | |
| tree | ed84eab0aa326f0af8421e20e99d57d62eab22e7 /solenv/gbuild | |
| parent | Adding upstream version 4:24.2.1. (diff) | |
| download | libreoffice-030eda2c4d6cad6d44c35499bcfc43ba89c88bb9.tar.xz libreoffice-030eda2c4d6cad6d44c35499bcfc43ba89c88bb9.zip | |
Adding upstream version 4:24.2.2.upstream/4%24.2.2
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'solenv/gbuild')
| -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 |