[Libreoffice-commits] core.git: solenv/gbuild unoidl/Module_unoidl.mk

[Stephan Bergmann (via logerrit)]

 solenv/gbuild/gbuild.mk |    2 ++
 unoidl/Module_unoidl.mk |    3 +--
 2 files changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 8c26281f84fc935600a99a1e83a26a841ae63fa9
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Fri Oct 30 16:27:55 2020 +0100
Commit:     Jan-Marek Glogowski <glogow at fbihome.de>
CommitDate: Sat Oct 31 06:44:49 2020 +0100

    Simplify makefile logic using new gb_not
    
    Change-Id: I19cb227a52fe6cd55dbba7b28689c4de995837fd
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105075
    Tested-by: Jenkins
    Reviewed-by: Jan-Marek Glogowski <glogow at fbihome.de>

diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index 999f5f79fa37..7c4df81bf257 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -46,6 +46,8 @@ MAKEFLAGS += r
 
 true := T
 false :=
+gb_not = $(if $(1),$(false),$(true))
+
 define NEWLINE
 
 
diff --git a/unoidl/Module_unoidl.mk b/unoidl/Module_unoidl.mk
index c8343bc6277a..11209c2d21fb 100644
--- a/unoidl/Module_unoidl.mk
+++ b/unoidl/Module_unoidl.mk
@@ -16,8 +16,7 @@ $(eval $(call gb_Module_Module,unoidl))
 $(eval $(call gb_Module_add_targets,unoidl, \
     $(if $(filter DESKTOP,$(BUILD_TYPE)), \
         Executable_unoidl-read) \
-    $(if $(CROSS_COMPILING), \
-        $(if $(filter ODK,$(BUILD_TYPE)),Executable_unoidl-check), \
+    $(if $(or $(filter ODK,$(BUILD_TYPE)),$(call gb_not,$(CROSS_COMPILING))), \
         Executable_unoidl-check) \
     Library_unoidl \
 ))