summaryrefslogtreecommitdiff
path: root/toolkit
diff options
context:
space:
mode:
authorJan-Marek Glogowski <glogow@fbihome.de>2022-01-05 11:49:19 +0100
committerJan-Marek Glogowski <glogow@fbihome.de>2022-01-05 18:00:59 +0100
commita6fae99466cd52143a52a98b0ac89588f679f1a1 (patch)
treeb40cee33275baa77f4cb322776fad6712dd0f547 /toolkit
parentdf9cbdd22658131b881e6527467c8e2a2dd36c70 (diff)
Disable epoxy test with --disable-gui
Instead of always testing for DISABLE_GUI, just disable the epoxy test and handle !ENABLE_EPOXY in RepositoryExternal.mk. Change-Id: I38213ffa77353bc93f32caa1b4164c5fa88170ac Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127999 Tested-by: Jenkins Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
Diffstat (limited to 'toolkit')
-rw-r--r--toolkit/Library_tk.mk6
1 files changed, 1 insertions, 5 deletions
diff --git a/toolkit/Library_tk.mk b/toolkit/Library_tk.mk
index 60321c5f3b90..018c44ddb2be 100644
--- a/toolkit/Library_tk.mk
+++ b/toolkit/Library_tk.mk
@@ -23,13 +23,9 @@ $(eval $(call gb_Library_set_componentfile,tk,toolkit/util/tk,services))
$(eval $(call gb_Library_use_externals,tk,\
boost_headers \
-))
-
-ifeq ($(DISABLE_GUI),)
-$(eval $(call gb_Library_use_externals,tk,\
epoxy \
))
-endif
+
$(eval $(call gb_Library_set_include,tk,\
$$(INCLUDE) \
-I$(SRCDIR)/toolkit/inc \