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

diff --git a/ChangeLog b/ChangeLog
index 22b2605d43ef325f15349b702b0cdcfa1003ca8a..fd2752f81c011b0470b86778626fe2e4cd5382e0 100644 (file)
--- 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 8743ee0cebacceb3321b9e735364c597fa2a39ce..f6c6fb4644e4eeec86e6cf5eebcd175beb7c865a 100644 (file)
--- 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