diff options
| author | Peter Foley <pefoley2@verizon.net> | 2013-03-27 14:10:57 -0400 |
|---|---|---|
| committer | Peter Foley <pefoley2@verizon.net> | 2013-03-28 09:58:14 -0400 |
| commit | 77169b9ceccfedeadef272f701425430cf1c719d (patch) | |
| tree | ece581b269674a1b4653c786e33793963ff06307 /solenv | |
| parent | 679ab714380c4e4508f123a6c6f6691289c9a653 (diff) | |
add javavm and jvmfwk to Library_merged
Change-Id: Ia59027e4eb9909b6afeab6dc6c7f76a6b60cd1c6
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/Library.mk | 3 | ||||
| -rw-r--r-- | solenv/gbuild/extensions/pre_MergedLibsList.mk | 2 |
2 files changed, 5 insertions, 0 deletions
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 \ |