From e772b90e7e8190112a987f7c18c19a33766acfd0 Mon Sep 17 00:00:00 2001 From: Carmelo Amoroso Date: Sun, 16 Mar 2008 08:51:34 +0000 Subject: Merge nptl branch tree with trunk. Step 6: fix Makefiles to use $(VERSION) and the compiler-driver for the link stage Signed-off-by: Carmelo Amoroso --- libpthread/linuxthreads/Makefile.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'libpthread/linuxthreads') diff --git a/libpthread/linuxthreads/Makefile.in b/libpthread/linuxthreads/Makefile.in index a5f52ec12..37ed96365 100644 --- a/libpthread/linuxthreads/Makefile.in +++ b/libpthread/linuxthreads/Makefile.in @@ -19,7 +19,7 @@ CFLAGS-libpthread/linuxthreads/sysdeps/pthread/ := $(CFLAGS-linuxthreads #CFLAGS:=$(CFLAGS:-O0=-O1) ifeq ($(PTHREADS_DEBUG_SUPPORT),y) -LDFLAGS-libpthread.so := $(LDFLAGS_NOSTRIP) -z defs +LDFLAGS-libpthread.so := $(LDFLAGS_NOSTRIP) -Wl,-z,defs else LDFLAGS-libpthread.so := $(LDFLAGS) endif @@ -29,7 +29,7 @@ LIBS-libpthread.so := $(LIBS) $(ldso) START_FILE-libpthread.so := $(SHARED_START_FILES) END_FILE-libpthread.so := $(SHARED_END_FILES) -libpthread_FULL_NAME := libpthread-$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBLEVEL).so +libpthread_FULL_NAME := libpthread-$(VERSION).so libpthread_DIR := $(top_srcdir)libpthread/linuxthreads libpthread_OUT := $(top_builddir)libpthread/linuxthreads -- cgit v1.2.3