1
0
mirror of https://sourceware.org/git/glibc.git synced 2025-07-29 11:41:21 +03:00

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.
This commit is contained in:
Mike Frysinger
2019-04-24 13:32:22 +02:00
committed by Florian Weimer
parent 439bf53496
commit f9b645b4b0
2 changed files with 9 additions and 2 deletions

View File

@ -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> 2019-04-24 Florian Weimer <fweimer@redhat.com>
* locale/Makefile (tests-special): Guard setting by * locale/Makefile (tests-special): Guard setting by

View File

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