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

[Stephan Bergmann]

 solenv/gbuild/platform/linux.mk |    3 +++
 1 file changed, 3 insertions(+)

New commits:
commit f90fce6568a04c67df9f487406831d7fdd5828e2
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Mon May 12 13:56:32 2014 +0200

    Linux Clang -fsanitize=address does not like -z defs
    
    Change-Id: Ie64d5fe5100a6da7a9bb591da65980d2080fb84f

diff --git a/solenv/gbuild/platform/linux.mk b/solenv/gbuild/platform/linux.mk
index 4ffa868..88216b6 100644
--- a/solenv/gbuild/platform/linux.mk
+++ b/solenv/gbuild/platform/linux.mk
@@ -7,9 +7,12 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
+ifneq ($(COM_GCC_IS_CLANG)$(filter -fsanitize=address,$(CC)),TRUE-fsanitize=address)
 gb_LinkTarget_LDFLAGS += \
         -Wl,-z,defs \
 
+endif
+
 include $(GBUILDDIR)/platform/unxgcc.mk
 
 # vim: set noet sw=4 ts=4: