diff options
Diffstat (limited to 'solenv/gbuild/extensions/pre_MergedLibsList.mk')
-rw-r--r-- | solenv/gbuild/extensions/pre_MergedLibsList.mk | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk b/solenv/gbuild/extensions/pre_MergedLibsList.mk index 12fd14edf522..579f0e3a8a67 100644 --- a/solenv/gbuild/extensions/pre_MergedLibsList.mk +++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk @@ -43,7 +43,9 @@ MERGE_LIBRARY_LIST := \ fwk \ $(if $(filter WNT,$(OS)),gdipluscanvas) \ guesslang \ - $(call gb_Helper_optional,DESKTOP,helplinker) \ + $(call gb_Helper_optional,DESKTOP, \ + $(if $(ENABLE_WASM_STRIP_CLUCENE),, \ + helplinker)) \ hyphen \ i18nsearch \ i18npool \ @@ -70,7 +72,7 @@ MERGE_LIBRARY_LIST := \ sofficeapp \ sot \ spell \ - $(if $(DISABLE_GUI),,spl) \ + $(if $(or $(DISABLE_GUI),$(ENABLE_WASM_STRIP_SPLASH)),,spl) \ srtrs1 \ $(call gb_Helper_optional,SCRIPTING,stringresource) \ svgio \ |