diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2016-03-22 09:58:48 +0100 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2016-03-22 09:58:48 +0100 |
| commit | b87e41378beca3c98ec3464d64835e66cc788497 (patch) | |
| tree | d3417b4b83fac3196d1ef7d4df920220440eb17d | |
| parent | 37ad347359c0bb9c85a5ce4a6ca8dc430db4dfd9 (diff) | |
| download | glibc-b87e41378beca3c98ec3464d64835e66cc788497.tar.gz glibc-b87e41378beca3c98ec3464d64835e66cc788497.tar.xz glibc-b87e41378beca3c98ec3464d64835e66cc788497.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.
| -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 0a0e9d975b..36360d9134 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-03-22 Joseph Myers <joseph@codesourcery.com> * sysdeps/unix/sysv/linux/kernel-features.h 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 |