diff options
| -rw-r--r-- | Library_merged.mk | 6 | ||||
| -rw-r--r-- | solenv/gbuild/extensions/pre_MergedLibsList.mk | 4 |
2 files changed, 4 insertions, 6 deletions
diff --git a/Library_merged.mk b/Library_merged.mk index 651f608e7426..7efcf9ec025e 100644 --- a/Library_merged.mk +++ b/Library_merged.mk @@ -87,12 +87,6 @@ $(eval $(call gb_Library_use_externals,merged,\ )) endif -ifneq ($(OS),IOS) -$(eval $(call gb_Library_use_libraries,merged,\ - jvmaccess \ -)) -endif - ifeq ($(GUIBASE),unx) $(eval $(call gb_Library_use_externals,merged,\ fontconfig \ diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk b/solenv/gbuild/extensions/pre_MergedLibsList.mk index 81a85a25e0c3..172ca7a17fd5 100644 --- a/solenv/gbuild/extensions/pre_MergedLibsList.mk +++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk @@ -70,7 +70,11 @@ gb_MERGEDLIBS := \ hyphen \ i18npool \ i18nutil \ + $(if $(filter TRUE,$(SOLAR_JAVA)),javaloader) \ $(if $(filter TRUE,$(SOLAR_JAVA)),javavm) \ + $(if $(filter TRUE,$(SOLAR_JAVA)),java_uno) \ + $(if $(filter TRUE,$(SOLAR_JAVA)),juh) \ + $(if $(filter-out IOS,$(OS)),jvmaccess) \ jvmfwk \ lng \ lnth \ |