From: Thomas Schwinge <thomas@schwinge.name>
Date: Thu, 10 May 2012 22:26:10 +0000 (-0700)
Subject: Hurd: Build pldd also if use-ldconfig != yes || build-shared != yes
X-Git-Tag: glibc-2.16-tps~399
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6103ae3b0eb1569cfdceb0e7c9625643b63dfd2a;p=thirdparty%2Fglibc.git

Hurd: Build pldd also if use-ldconfig != yes || build-shared != yes
---

diff --git a/ChangeLog b/ChangeLog
index 22b2605d43e..fd2752f81c0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2012-05-10  Thomas Schwinge  <thomas@schwinge.name>
+
+	* elf/Makefile (pldd-modules): Define unconditionally.
+
 2012-05-10  Thomas Schwinge  <thomas@schwinge.name>
 
 	* sysdeps/mach/hurd/opendir.c (__opendirat): New function.
diff --git a/elf/Makefile b/elf/Makefile
index 8743ee0ceba..f6c6fb4644e 100644
--- a/elf/Makefile
+++ b/elf/Makefile
@@ -80,15 +80,14 @@ install-rootsbin += ldconfig
 
 ldconfig-modules := cache readlib xmalloc xstrdup chroot_canon
 extra-objs	+= $(ldconfig-modules:=.o)
+endif
+endif
 
 pldd-modules := xmalloc
 
 # To find xmalloc.c and xstrdup.c
 vpath %.c ../locale/programs
 
-endif
-endif
-
 ifeq ($(have-ksh)$(build-shared),yesyes)
 extra-objs += sotruss-lib.os sotruss-lib.so
 install-others += $(inst_auditdir)/sotruss-lib.so