diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2015-05-14 17:15:24 +0200 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2015-05-14 17:15:24 +0200 |
| commit | 5d92b32f4e07db0494c9edf549072621afb3804f (patch) | |
| tree | d69a7b0715df2df63db28e3ad79f91203a449b76 | |
| parent | e685cf71a83efb6379a1bc6c11bd0fbb34150d9b (diff) | |
| parent | 8e9e36074a084c614b7abcc9efae7d6772e3ccbd (diff) | |
Merge branch 'master' into master-glibcglibc-2.19-hurd+libpthread-20150515
| -rw-r--r-- | Makefile | 6 |
1 files changed, 1 insertions, 5 deletions
@@ -196,7 +196,7 @@ vpath %.c extra-libs := libpthread extra-libs-others := $(extra-libs) -install-lib-ldscripts := libpthread.so +install-lib := libpthread.so include ../Makeconfig endif @@ -273,10 +273,6 @@ $(inst_libdir)/libpthread2_pic.a: $(inst_libdir)/libpthread_pic.a $(INSTALL_DATA) $(srcdir)/libpthread_pic.a $< ifeq ($(IN_GLIBC),yes) -$(inst_libdir)/libpthread.so: $(objpfx)libpthread.so$(libpthread.so-version) \ - $(+force) - ln -sf $(slibdir)/libpthread.so$(libpthread.so-version) $@ - libc-link.so = $(common-objpfx)libc.so extra-B-pthread.so = -B$(common-objpfx)libpthread/ |