summaryrefslogtreecommitdiff
path: root/Repository.mk
diff options
context:
space:
mode:
authorJan-Marek Glogowski <glogow@fbihome.de>2021-05-19 12:16:42 +0200
committerJan-Marek Glogowski <glogow@fbihome.de>2021-12-03 06:46:24 +0100
commitfb308c193bc9f0d07ad2cccd5a0b239f86cbe442 (patch)
tree11cbb10810a968567b3c215efb353acb4ca23194 /Repository.mk
parent6ac1e9e7f0be23b529992c268d2c563fe40fff76 (diff)
Fix --disable-scripting for DESKTOP build
Unfortunatly we cannot add --disable-scripting to sub_conf_defaults, because Java currently has no equivalent to the PYTHON_FOR_BUILD setting. Change-Id: I89938a17307a363f5de808200914940503312829 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126186 Tested-by: Jenkins Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
Diffstat (limited to 'Repository.mk')
-rw-r--r--Repository.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/Repository.mk b/Repository.mk
index 5b867ca478bc..ee6c60fb33d0 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -956,7 +956,7 @@ $(eval $(call gb_Helper_register_packages_for_install,ooo,\
$(if $(ENABLE_SCRIPTING_BEANSHELL),scripting_ScriptsBeanShell) \
$(if $(ENABLE_SCRIPTING_JAVASCRIPT),scripting_ScriptsJavaScript) \
) \
- $(if $(DISABLE_SCRIPTING),,scripting_scriptbindinglib) \
+ $(call gb_Helper_optional,SCRIPTING,scripting_scriptbindinglib) \
$(if $(filter $(OS),MACOSX),sysui_osxicons) \
wizards_basicshare \
wizards_basicsrvaccess2base \