diff options
| author | Florian Weimer <fweimer@redhat.com> | 2017-10-16 20:50:04 +0200 |
|---|---|---|
| committer | Florian Weimer <fweimer@redhat.com> | 2017-10-16 20:50:04 +0200 |
| commit | d8287b36ab44aa2bc3ba59b97433bcf0ab6ae0e8 (patch) | |
| tree | 7e997dfdd7e00baec9ecf5590eeede81b7cf4973 | |
| parent | 3480ddc40b8f9a9fb277fe1883e359db3db0ab17 (diff) | |
| download | glibc-d8287b36ab44aa2bc3ba59b97433bcf0ab6ae0e8.tar.gz glibc-d8287b36ab44aa2bc3ba59b97433bcf0ab6ae0e8.tar.xz glibc-d8287b36ab44aa2bc3ba59b97433bcf0ab6ae0e8.zip | |
malloc: Do not compile mcheck-init.o as libc module
Otherwise, this will lead to a link failure because the reference to mcheck is hidden.
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | malloc/Makefile | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog index debac64d25..c10cb9fd22 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2017-10-16 Florian Weimer <fweimer@redhat.com> + + * malloc/Makefile (others-extras): Set to mcheck-init.o. + 2017-10-16 Carlos O'Donell <carlos@redhat.com> * include/shlib-compat.h (compat_symbol_reference): Update diff --git a/malloc/Makefile b/malloc/Makefile index 6cf78e1177..7ae3d825b9 100644 --- a/malloc/Makefile +++ b/malloc/Makefile @@ -100,6 +100,7 @@ LDFLAGS-tst-mallocstate = -rdynamic # These should be removed by `make clean'. extra-objs = mcheck-init.o libmcheck.a +others-extras = mcheck-init.o # Include the cleanup handler. aux := set-freeres thread-freeres |