diff options
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/extensions/pre_MergedLibsList.mk | 2 | ||||
| -rw-r--r-- | solenv/gbuild/gbuild.mk | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk b/solenv/gbuild/extensions/pre_MergedLibsList.mk index 859ea8a0da73..8f8320a2336e 100644 --- a/solenv/gbuild/extensions/pre_MergedLibsList.mk +++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk @@ -92,7 +92,7 @@ gb_EXTRAMERGEDLIBS := \ $(call gb_Helper_optional,DESKTOP,unopkgapp) \ unotest \ $(call gb_Helper_optional,DESKTOP,updatefeed) \ - $(if $(DISABLE_SCRIPTING),,vbahelper) \ + $(call gb_Helper_optional,SCRIPTING,vbahelper) \ xmlfa \ xmlfd \ xmlsecurity \ diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk index 52539aeefc28..294c7d18df4b 100644 --- a/solenv/gbuild/gbuild.mk +++ b/solenv/gbuild/gbuild.mk @@ -258,7 +258,6 @@ gb_GLOBALDEFS += \ $(call gb_Helper_define_if_set,\ DISABLE_DYNLOADING \ DISABLE_EXPORT \ - DISABLE_SCRIPTING \ ENABLE_LTO \ ) |