summaryrefslogtreecommitdiff
path: root/libc
diff options
context:
space:
mode:
authornathan <nathan@7b3dc134-2b1b-0410-93df-9e9f96275f8d>2011-05-11 14:18:02 +0000
committernathan <nathan@7b3dc134-2b1b-0410-93df-9e9f96275f8d>2011-05-11 14:18:02 +0000
commitec66928153cc50fcb0748ffa9a2bced136c48895 (patch)
tree14c1f3c57cb6d3a03bbc552e35505a494b37e99f /libc
parent4b968931720cdf273465db07be69802e60304981 (diff)
* malloc/Makefile (libmemusage.so): Add libc_nonshared.a dependency.
git-svn-id: svn://svn.eglibc.org/trunk@13770 7b3dc134-2b1b-0410-93df-9e9f96275f8d
Diffstat (limited to 'libc')
-rw-r--r--libc/ChangeLog.eglibc4
-rw-r--r--libc/malloc/Makefile3
2 files changed, 6 insertions, 1 deletions
diff --git a/libc/ChangeLog.eglibc b/libc/ChangeLog.eglibc
index e794928a9..b29e1b96a 100644
--- a/libc/ChangeLog.eglibc
+++ b/libc/ChangeLog.eglibc
@@ -1,3 +1,7 @@
+2011-05-11 Nathan Sidwell <nathan@codesourcery.com>
+
+ * malloc/Makefile (libmemusage.so): Add libc_nonshared.a dependency.
+
2011-02-28 Pierre Ynard <linkfanel@yahoo.fr>
[BZ #12492]
diff --git a/libc/malloc/Makefile b/libc/malloc/Makefile
index 1ba397215..e5986b16a 100644
--- a/libc/malloc/Makefile
+++ b/libc/malloc/Makefile
@@ -159,7 +159,8 @@ $(objpfx)memusage: memusage.sh
# The implementation uses `dlsym'
-$(objpfx)libmemusage.so: $(common-objpfx)dlfcn/libdl.so $(elfobjdir)/ld.so
+$(objpfx)libmemusage.so: $(common-objpfx)dlfcn/libdl.so $(elfobjdir)/ld.so \
+ $(common-objpfx)libc_nonshared.a
# Extra dependencies
$(foreach o,$(all-object-suffixes),$(objpfx)malloc$(o)): arena.c hooks.c