memusagestat: use local glibc when linking [BZ #18465]

The memusagestat is the only binary that has its own link line which
causes it to be linked against the existing installed C library.  It
has been this way since it was originally committed in 1999, but I
don't see any reason as to why.  Since we want all the programs we
build locally to be against the new copy of glibc, change the build
to be like all other programs.

diff --git a/ChangeLog b/ChangeLog
index 37a39c023f4a77cc7ed355cbe1c5c1e63dc785f1..5429f85386638dca4fdb45404836630d1643de94 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2019-04-24  Mike Frysinger  <vapier@gentoo.org>
+
+       [BZ #18465]
+       * malloc/Makefile (others): Add memusagestat.
+       ($(objpfx)memusagestat): Delete rule.
+       (LDLIBS-memusagestat): New variable.
+
 2019-04-24  Florian Weimer  <fweimer@redhat.com>
 
        * locale/Makefile (tests-special): Guard setting by

diff --git a/malloc/Makefile b/malloc/Makefile
index ab2eed09c6dabd97b75ce0a3d66530804f758ec9..aadf602dfd78590afebf5409ff9d15b85bf1db79 100644 (file)
--- a/malloc/Makefile
+++ b/malloc/Makefile
@@ -131,6 +131,7 @@ ifneq ($(cross-compiling),yes)
 # If the gd library is available we build the `memusagestat' program.
 ifneq ($(LIBGD),no)
 others: $(objpfx)memusage
+others += memusagestat
 install-bin = memusagestat
 install-bin-script += memusage
 generated += memusagestat memusage
@@ -154,8 +155,7 @@ cpp-srcs-left := $(memusagestat-modules)
 lib := memusagestat
 include $(patsubst %,$(..)libof-iterator.mk,$(cpp-srcs-left))
 
-$(objpfx)memusagestat: $(memusagestat-modules:%=$(objpfx)%.o)
-       $(LINK.o) -o $@ $^ $(libgd-LDFLAGS) -lgd -lpng -lz -lm
+LDLIBS-memusagestat = $(libgd-LDFLAGS) -lgd -lpng -lz -lm
 
 ifeq ($(run-built-tests),yes)
 ifeq (yes,$(build-shared))