diff options
| author | Mike Frysinger <vapier@gentoo.org> | 2019-04-24 13:32:22 +0200 |
|---|---|---|
| committer | Florian Weimer <fweimer@redhat.com> | 2019-04-24 13:36:28 +0200 |
| commit | f9b645b4b0a10c43753296ce3fa40053fa44606a (patch) | |
| tree | 1b2562b9701e4e8026e62a3d095bf9a1a6a44b0e | |
| parent | 439bf53496d6ed5fcef1d2e71793b46369f8205f (diff) | |
| download | glibc-f9b645b4b0a10c43753296ce3fa40053fa44606a.zip glibc-f9b645b4b0a10c43753296ce3fa40053fa44606a.tar.gz glibc-f9b645b4b0a10c43753296ce3fa40053fa44606a.tar.bz2 | |
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.
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | malloc/Makefile | 4 |
2 files changed, 9 insertions, 2 deletions
@@ -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 ab2eed0..aadf602 100644 --- 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)) |