a2969884af
Change-Id: Ia236c7124d920785f7a2856db5ee1ccbef7a2d68 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143038 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
12 lines
664 B
Groff
12 lines
664 B
Groff
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
|
|
@@ -157,7 +157,7 @@
|
|
# we don't use -z defs there.
|
|
# Also, -z defs conflicts with Address Sanitizer, which emits relocations
|
|
# against the libsanitizer runtime built into the main executable.
|
|
-ZDEFS_FLAG = -Wl,-z,defs
|
|
+ZDEFS_FLAG =
|
|
DSO_LDOPTS += $(if $(findstring 2.11.90.0.8,$(shell $(LD) -v)),,$(ZDEFS_FLAG)) $(if $(filter-out $(OS),ANDROID),-Wl$(COMMA)-z$(COMMA)origin '-Wl$(COMMA)-rpath$(COMMA)$$ORIGIN')
|
|
LDFLAGS += $(ARCHFLAG) -z noexecstack
|
|
|