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

[Jan-Marek Glogowski (via logerrit)]

 unoidl/Module_unoidl.mk |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit dadda916d42b94936a01a7f66b5c6c63e1e00f8f
Author:     Jan-Marek Glogowski <glogow at fbihome.de>
AuthorDate: Fri Oct 30 09:38:31 2020 +0100
Commit:     Jan-Marek Glogowski <glogow at fbihome.de>
CommitDate: Fri Oct 30 11:20:34 2020 +0100

    Fix unoidl-check build condition for cross builds
    
    $(filter-out ...) is not the same as !$(filter ...). So hopefully
    this conditional variant is now correct for cross builds. This
    should fix the missing host unoidl-check for the host ODK needed
    in the SDK package.
    
    Change-Id: I0cbe4da1f5cd3493c9b214d8263e7e9584dc535c
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105037
    Tested-by: Jenkins
    Reviewed-by: Jan-Marek Glogowski <glogow at fbihome.de>

diff --git a/unoidl/Module_unoidl.mk b/unoidl/Module_unoidl.mk
index a8b8ba14d2e5..851cea9b7354 100644
--- a/unoidl/Module_unoidl.mk
+++ b/unoidl/Module_unoidl.mk
@@ -9,12 +9,13 @@
 
 $(eval $(call gb_Module_Module,unoidl))
 
-# Executable_unoidl-check: !CROSS || ODK => !(CROSS && !ODK)
+# Executable_unoidl-check: !CROSS || ODK => CROSS (&& ODK && unoidl-check) || unoidl-check
 
 $(eval $(call gb_Module_add_targets,unoidl, \
     $(if $(filter DESKTOP,$(BUILD_TYPE)), \
         Executable_unoidl-read) \
-    $(if $(and $(CROSS_COMPILING),$(filter-out ODK,$(BUILD_TYPE))),, \
+    $(if $(CROSS_COMPILING), \
+        $(if $(filter ODK,$(BUILD_TYPE)),Executable_unoidl-check), \
         Executable_unoidl-check) \
     Library_unoidl \
 ))