diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2017-09-18 11:35:23 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2017-09-18 11:35:23 +0200 |
| commit | 69e62bbebc1f4809101df0c694a930b07dbc194d (patch) | |
| tree | 678790612575b2e82530e35b941f8a3eed0adb8d /external/nss | |
| parent | 80363950fda5eeef9830f61e57899d1805c91751 (diff) | |
Adapt external/nss/asan.patch.1
...to a52ca01f6ae27a86cae6e82b3c5ae6601f3ea398 "nss: no rpath/origin flag for
Android (unused DT entry/DT_FLAGS warnings)"
Change-Id: I60e4ba1af572aa702a355e26dec58142209f8655
Diffstat (limited to 'external/nss')
| -rw-r--r-- | external/nss/asan.patch.1 | 2 |
1 files changed, 1 insertions, 1 deletions
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 |