aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Schwinge <thomas@schwinge.name>2012-05-10 15:26:10 -0700
committerRoland McGrath <roland@hack.frob.com>2012-05-10 15:57:26 -0700
commit6103ae3b0eb1569cfdceb0e7c9625643b63dfd2a (patch)
treeb2668dd10c3b83e97d0952fd98664092b14e483d
parent80b4e5f3ef231702b24d44c33e8dceb70abb3a06 (diff)
downloadglibc-6103ae3b0eb1569cfdceb0e7c9625643b63dfd2a.zip
glibc-6103ae3b0eb1569cfdceb0e7c9625643b63dfd2a.tar.gz
glibc-6103ae3b0eb1569cfdceb0e7c9625643b63dfd2a.tar.bz2
Hurd: Build pldd also if use-ldconfig != yes || build-shared != yes
-rw-r--r--ChangeLog4
-rw-r--r--elf/Makefile5
2 files changed, 6 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 22b2605..fd2752f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
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.
2012-05-10 Samuel Thibault <samuel.thibault@ens-lyon.org>
diff --git a/elf/Makefile b/elf/Makefile
index 8743ee0..f6c6fb4 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