[Libreoffice-commits] core.git: external/nss

[Stephan Bergmann]

 external/nss/asan.patch.1 |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 69e62bbebc1f4809101df0c694a930b07dbc194d
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Mon Sep 18 11:35:23 2017 +0200

    Adapt external/nss/asan.patch.1
    
    ...to a52ca01f6ae27a86cae6e82b3c5ae6601f3ea398 "nss: no rpath/origin flag for
    Android (unused DT entry/DT_FLAGS warnings)"
    
    Change-Id: I60e4ba1af572aa702a355e26dec58142209f8655

diff --git a/external/nss/asan.patch.1 b/external/nss/asan.patch.1
index 6acbb04d233d..7dfd6ed4e782 100644
--- a/external/nss/asan.patch.1
+++ b/external/nss/asan.patch.1
@@ -7,6 +7,6 @@ diff -ur nss.org/nss/coreconf/Linux.mk nss/nss/coreconf/Linux.mk
  # 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)) -Wl,-z,origin '-Wl,-rpath,$$ORIGIN'
+ 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