You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by zw...@apache.org on 2021/09/02 19:22:06 UTC
[trafficserver] branch 9.1.x updated: Cleanup generated LDFLAGS for
jemalloc (#8285)
This is an automated email from the ASF dual-hosted git repository.
zwoop pushed a commit to branch 9.1.x
in repository https://gitbox.apache.org/repos/asf/trafficserver.git
The following commit(s) were added to refs/heads/9.1.x by this push:
new 7347687 Cleanup generated LDFLAGS for jemalloc (#8285)
7347687 is described below
commit 73476879fbe6ca818e9a79e35258b929b6c61cc4
Author: Randall Meyer <rr...@apache.org>
AuthorDate: Mon Aug 30 20:09:51 2021 -0700
Cleanup generated LDFLAGS for jemalloc (#8285)
Use the already expanded jemalloc_ldflags instead of overwriting what
was previously specified earlier in the file.
Also, drop use --add-needed,--no-as-needed
(cherry picked from commit 9b3cde501d9f72d250a34f6d4742c816e1e7797b)
---
build/jemalloc.m4 | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/build/jemalloc.m4 b/build/jemalloc.m4
index 8bfae41..e341f2f 100644
--- a/build/jemalloc.m4
+++ b/build/jemalloc.m4
@@ -55,8 +55,7 @@ if test "$enable_jemalloc" != "no"; then
jemalloc_have_libs=0
if test "$jemalloc_base_dir" != "/usr"; then
TS_ADDTO(CPPFLAGS, [-I${jemalloc_include}])
- TS_ADDTO(LDFLAGS, [-L${jemalloc_ldflags}])
- TS_ADDTO(LDFLAGS, [-Wl,--add-needed -L${jemalloc_base_dir}/lib -Wl,-rpath,${jemalloc_base_dir}/lib -Wl,--no-as-needed])
+ TS_ADDTO(LDFLAGS, [-L${jemalloc_ldflags} -Wl,-rpath,${jemalloc_ldflags}])
TS_ADDTO_RPATH(${jemalloc_ldflags})
fi
# On Darwin, jemalloc symbols are prefixed with je_. Search for that first, then fall back