summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Library_merged.mk1
-rw-r--r--solenv/gbuild/extensions/pre_MergedLibsList.mk2
2 files changed, 3 insertions, 0 deletions
diff --git a/Library_merged.mk b/Library_merged.mk
index 7efcf9ec025e..7122e4fec8b4 100644
--- a/Library_merged.mk
+++ b/Library_merged.mk
@@ -69,6 +69,7 @@ $(eval $(call gb_Library_use_externals,merged,\
nss3 \
openssl \
orcus \
+ $(call gb_Helper_optional,PYUNO,python) \
$(if $(filter-out IOS,$(OS)),wpd) \
$(if $(filter-out IOS,$(OS)),wpg) \
$(if $(filter-out IOS,$(OS)),wps) \
diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk b/solenv/gbuild/extensions/pre_MergedLibsList.mk
index 172ca7a17fd5..d5152080fce5 100644
--- a/solenv/gbuild/extensions/pre_MergedLibsList.mk
+++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk
@@ -89,6 +89,8 @@ gb_MERGEDLIBS := \
oox \
package2 \
pricing \
+ $(call gb_Helper_optional,PYUNO,pythonloader) \
+ $(call gb_Helper_optional,PYUNO,pyuno) \
$(call gb_Helper_optional,DBCONNECTIVITY,rpt) \
$(call gb_Helper_optional,DBCONNECTIVITY,rptui) \
$(call gb_Helper_optional,DBCONNECTIVITY,rptxml) \