diff options
| -rw-r--r-- | Library_merged.mk | 1 | ||||
| -rw-r--r-- | solenv/gbuild/Library.mk | 3 | ||||
| -rw-r--r-- | solenv/gbuild/extensions/pre_MergedLibsList.mk | 2 |
3 files changed, 5 insertions, 1 deletions
diff --git a/Library_merged.mk b/Library_merged.mk index 45119e9b7021..db8991dbf75e 100644 --- a/Library_merged.mk +++ b/Library_merged.mk @@ -34,7 +34,6 @@ $(eval $(call gb_Library_use_libraries,merged,\ cppu \ cppuhelper \ i18nisolang1 \ - jvmfwk \ sal \ salhelper \ tl \ diff --git a/solenv/gbuild/Library.mk b/solenv/gbuild/Library.mk index 116d5c462a95..b5a9b4ff14f5 100644 --- a/solenv/gbuild/Library.mk +++ b/solenv/gbuild/Library.mk @@ -123,8 +123,11 @@ $(call gb_ComponentTarget_ComponentTarget,$(2),\ $(call gb_Library_get_runtime_filename,$(gb_Library__get_name))) $(call gb_Library__get_final_target,$(gb_Library__get_name)) : \ $(call gb_ComponentTarget_get_outdir_target,$(2)) +# prevent circular deps: Library_merged -> localedata -> saxparser -> services.rdb -> javavm.component +ifneq ($(gb_Library__get_name),merged) $(call gb_ComponentTarget_get_target,$(2)) :| \ $(call gb_Library_get_target,$(gb_Library__get_name)) +endif $(call gb_Library_get_clean_target,$(gb_Library__get_name)) : \ $(call gb_ComponentTarget_get_clean_target,$(2)) endef diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk b/solenv/gbuild/extensions/pre_MergedLibsList.mk index 3efa62591f7b..f9aa2513d12d 100644 --- a/solenv/gbuild/extensions/pre_MergedLibsList.mk +++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk @@ -60,6 +60,8 @@ gb_MERGEDLIBS := \ $(call gb_Helper_optional,DESKTOP,helplinker) \ i18npool \ i18nutil \ + $(if $(filter TRUE,$(SOLAR_JAVA)),javavm) \ + jvmfwk \ lng \ localebe1 \ localedata_en \ |