[Libreoffice-commits] core.git: jurt/Library_jpipe.mk

[Stephan Bergmann]

 jurt/Library_jpipe.mk |   11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

New commits:
commit 52821cd8dc62a2287153dcd413377539bb070ae0
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Thu Sep 4 14:10:12 2014 +0200

    Fix condition
    
    Change-Id: I8e70a62959dbeecd571c15c5b6fac1a41511a3f6

diff --git a/jurt/Library_jpipe.mk b/jurt/Library_jpipe.mk
index 2ca6cb7..6d1512e 100644
--- a/jurt/Library_jpipe.mk
+++ b/jurt/Library_jpipe.mk
@@ -21,7 +21,15 @@ $(eval $(call gb_Library_add_cobjects,jpipe,\
     jurt/source/pipe/wrapper/wrapper \
 ))
 
-else ifeq ($(COM_GCC_IS_CLANG)$(filter -fsanitize=%,%(gb_CC)),)
+else
+
+ifeq ($(COM_GCC_IS_CLANG),TRUE)
+ifneq ($(filter -fsanitize=%,$(gb_CC)),)
+Library_jpipe__staticsalhack = TRUE
+endif
+endif
+
+ifeq ($(Library_jpipe__staticsalhack),)
 
 $(eval $(call gb_Library_use_libraries,jpipe,\
     sal \
@@ -75,5 +83,6 @@ $(call gb_LinkTarget_get_target,$(call gb_Library_get_linktarget,jpipe)): \
     gb_CXX := $(filter-out -fsanitize=%,$(gb_CXX))
 
 endif
+endif
 
 # vim:set noet sw=4 ts=4: