Adapt external/nss/asan.patch.1

...to a52ca01f6a "nss: no rpath/origin flag for
Android (unused DT entry/DT_FLAGS warnings)"

Change-Id: I60e4ba1af572aa702a355e26dec58142209f8655
This commit is contained in:
Stephan Bergmann 2017-09-18 11:35:23 +02:00
parent 80363950fd
commit 69e62bbebc

View file

@ -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