diff options
| author | Jan-Marek Glogowski <glogow@fbihome.de> | 2022-01-05 11:49:19 +0100 |
|---|---|---|
| committer | Jan-Marek Glogowski <glogow@fbihome.de> | 2022-01-05 18:00:59 +0100 |
| commit | a6fae99466cd52143a52a98b0ac89588f679f1a1 (patch) | |
| tree | b40cee33275baa77f4cb322776fad6712dd0f547 /RepositoryExternal.mk | |
| parent | df9cbdd22658131b881e6527467c8e2a2dd36c70 (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 'RepositoryExternal.mk')
| -rw-r--r-- | RepositoryExternal.mk | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 7feb93cc150d..7262a0eaa7af 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -224,7 +224,9 @@ endef endif # SYSTEM_CPPUNIT -ifneq ($(SYSTEM_EPOXY),) + +ifeq ($(ENABLE_EPOXY),TRUE) +ifeq ($(SYSTEM_EPOXY),TRUE) define gb_LinkTarget__use_epoxy $(call gb_LinkTarget_set_include,$(1),\ @@ -260,7 +262,14 @@ $(call gb_ExternalProject_use_external_project,$(1),epoxy) endef -endif # SYSTEM_EPOXY +endif # !SYSTEM_EPOXY +else # !ENABLE_EPOXY + +gb_LinkTarget__use_epoxy := +gb_ExternalProject__use_epoxy := + +endif # !ENABLE_EPOXY + define gb_LinkTarget__use_iconv ifeq ($(COM),MSC) |