summaryrefslogtreecommitdiff
path: root/basctl
diff options
context:
space:
mode:
authorNoel Grandin <noelgrandin@gmail.com>2020-04-12 20:33:08 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2020-04-12 21:43:47 +0200
commitbef94cb69c2bee4a66c3ab5a93e399d8a320be0d (patch)
tree508de2902c7cd6174c45c16ec395b51b559836de /basctl
parent4c099dcdbd2b96fc586d920b6a22139bd1a4c705 (diff)
no need to pass ENABLE_MERGELIBS in command line flags
since we put it into the config_options.h header Change-Id: I72320762f8f7b671d69675b8afb17b7bfa2e706d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92089 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'basctl')
-rw-r--r--basctl/Library_basctl.mk4
1 files changed, 0 insertions, 4 deletions
diff --git a/basctl/Library_basctl.mk b/basctl/Library_basctl.mk
index 20e00351ef30..acd12b474160 100644
--- a/basctl/Library_basctl.mk
+++ b/basctl/Library_basctl.mk
@@ -29,10 +29,6 @@ $(eval $(call gb_Library_set_include,basctl,\
-I$(WORKDIR)/SdiTarget/basctl/sdi \
))
-$(eval $(call gb_Library_add_defs,basctl,\
- -DENABLE_MERGELIBS=$(if $(MERGELIBS),1,0) \
-))
-
$(eval $(call gb_Library_use_external,basctl,boost_headers))
$(eval $(call gb_Library_use_custom_headers,basctl,\