strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

-fsanitize=address does not like -z defs

Browse source 
Change-Id: Id2a5c3009b46f9f91706b433411ca9f9c3cb7e39
Reviewed-on: https://gerrit.libreoffice.org/9334
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Tested-by: Stephan Bergmann <sbergman@redhat.com>
This commit is contained in:
Markus Mohrhard 2014-05-13 02:12:17 +02:00 committed by Stephan Bergmann
parent 08947735f9
commit 3c5bc3128f
2 changed files with 18 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
external/nss/UnpackedTarball_nss.mk vendored
View file

@ -23,4 +23,10 @@ $(eval $(call gb_UnpackedTarball_add_patches,nss,\
external/nss/nss.mingw.patch.3) \
))
ifeq ($(COM_GCC_IS_CLANG)$(filter -fsanitize=address,$(CC)),TRUE-fsanitize=address)
$(eval $(call gb_UnpackedTarball_add_patches,nss,\
external/nss/asan.patch.1 \
))
endif
# vim: set noet sw=4 ts=4:

12
external/nss/asan.patch.1 vendored Normal file
View file

@ -0,0 +1,12 @@
diff -ur nss.org/nss/coreconf/Linux.mk nss/nss/coreconf/Linux.mk
--- nss.org/nss/coreconf/Linux.mk 2014-05-06 04:36:01.817838877 +0200
+++ nss/nss/coreconf/Linux.mk 2014-05-06 04:37:25.387835456 +0200
@@ -145,7 +145,7 @@
# The linker on Red Hat Linux 7.2 and RHEL 2.1 (GNU ld version 2.11.90.0.8)
# incorrectly reports undefined references in the libraries we link with, so
# we don't use -z defs there.
-ZDEFS_FLAG = -Wl,-z,defs
+ZDEFS_FLAG =
DSO_LDOPTS += $(if $(findstring 2.11.90.0.8,$(shell ld -v)),,$(ZDEFS_FLAG)) -Wl,-z,origin '-Wl,-rpath,$$ORIGIN'
LDFLAGS += $(ARCHFLAG)