diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2016-03-22 09:58:48 +0100 |
|---|---|---|
| committer | Florian Weimer <fweimer@redhat.com> | 2016-05-09 11:22:00 +0200 |
| commit | a5c2f42566460fc73755c768e8e1c59dbd5a4bb2 (patch) | |
| tree | 47d87f187e148756aa5dcc063739da60c9c8c85b | |
| parent | f69ae17e843b00d3495b736f4381c1fa64dc02bc (diff) | |
| download | glibc-a5c2f42566460fc73755c768e8e1c59dbd5a4bb2.tar.gz glibc-a5c2f42566460fc73755c768e8e1c59dbd5a4bb2.tar.xz glibc-a5c2f42566460fc73755c768e8e1c59dbd5a4bb2.zip | |
Fix malloc threaded tests link on non-Linux
* malloc/Makefile ($(objpfx)tst-malloc-backtrace, $(objpfx)tst-malloc-thread-exit, $(objpfx)tst-malloc-thread-fail): Use $(shared-thread-library) instead of hardcoding the path to libpthread. (cherry picked from commit b87e41378beca3c98ec3464d64835e66cc788497)
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | malloc/Makefile | 9 |
2 files changed, 9 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog index 06bb23f89a..adf920a335 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2016-03-22 Samuel Thibault <samuel.thibault@ens-lyon.org> + + * malloc/Makefile ($(objpfx)tst-malloc-backtrace, + $(objpfx)tst-malloc-thread-exit, $(objpfx)tst-malloc-thread-fail): Use + $(shared-thread-library) instead of hardcoding the path to libpthread. + 2016-02-19 Florian Weimer <fweimer@redhat.com> * sysdeps/generic/malloc-machine.h: Assume mutex_init is always diff --git a/malloc/Makefile b/malloc/Makefile index 360288bef8..59d4264ae0 100644 --- a/malloc/Makefile +++ b/malloc/Makefile @@ -46,12 +46,9 @@ extra-libs-others = $(extra-libs) libmemusage-routines = memusage libmemusage-inhibit-o = $(filter-out .os,$(object-suffixes)) -$(objpfx)tst-malloc-backtrace: $(common-objpfx)nptl/libpthread.so \ - $(common-objpfx)nptl/libpthread_nonshared.a -$(objpfx)tst-malloc-thread-exit: $(common-objpfx)nptl/libpthread.so \ - $(common-objpfx)nptl/libpthread_nonshared.a -$(objpfx)tst-malloc-thread-fail: $(common-objpfx)nptl/libpthread.so \ - $(common-objpfx)nptl/libpthread_nonshared.a +$(objpfx)tst-malloc-backtrace: $(shared-thread-library) +$(objpfx)tst-malloc-thread-exit: $(shared-thread-library) +$(objpfx)tst-malloc-thread-fail: $(shared-thread-library) # These should be removed by `make clean'. extra-objs = mcheck-init.o libmcheck.a |