[Libreoffice-commits] core.git: connectivity/Module_connectivity.mk

Stephan Bergmann sbergman at redhat.com
Wed Feb 4 08:03:47 PST 2015


 connectivity/Module_connectivity.mk |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit c0f080403b869e162dc81db6c8c50b7360a88883
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed Feb 4 17:03:00 2015 +0100

    Do not let WNT non-INTEL run into the else branch
    
    Change-Id: I85a5f35fb8b44734e84c686ecdffc6096226b91d

diff --git a/connectivity/Module_connectivity.mk b/connectivity/Module_connectivity.mk
index 97310d1..ade21dd 100644
--- a/connectivity/Module_connectivity.mk
+++ b/connectivity/Module_connectivity.mk
@@ -102,7 +102,9 @@ $(eval $(call gb_Module_add_targets,connectivity,\
 ))
 endif
 
-ifeq ($(OS)-$(CPU),WNT-INTEL)
+ifeq ($(OS),WNT)
+
+ifeq ($(CPU),INTEL)
 
 ifneq ($(WITH_MOZAB4WIN),)
 $(eval $(call gb_Module_add_targets,connectivity,\
@@ -116,6 +118,8 @@ $(eval $(call gb_Module_add_targets,connectivity,\
 ))
 endif
 
+endif
+
 else ifneq (,$(filter DESKTOP,$(BUILD_TYPE)))
 
 $(eval $(call gb_Module_add_targets,connectivity,\


More information about the Libreoffice-commits mailing list