5bcd333501
https://lists.freedesktop.org/archives/libreoffice/2020-March/084769.html etc. This reverts commitc76fdcf1cf. This reverts commit10f52ab4d2. This reverts commiteac806e8dc. This reverts commitd591a682e4. This reverts commit12235d3390. This reverts commit23245f723f. This reverts commit91658b402b. This reverts commit5feadfad0c. This reverts commitfecca49c30. This reverts commitc6a9454e74. This reverts commita1a62a7041. This reverts commit8512f4ca09. This reverts commit532ffb7a29. Change-Id: Iaa48d692bea2ca2468cdd5f8ad26ad91c0c31dde Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91199 Tested-by: Jenkins Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
12 lines
656 B
Groff
12 lines
656 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
|
|
@@ -146,7 +146,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
|
|
|