aboutsummaryrefslogtreecommitdiff
path: root/nscd
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2003-09-24 17:38:32 +0000
committerUlrich Drepper <drepper@redhat.com>2003-09-24 17:38:32 +0000
commit0f124303c8bebc3258d2d22bdc03271e85b9ea42 (patch)
treed7271a216e4bf53a54f3df35981a098d0b93a654 /nscd
parentc9c60884afdfe24eceb42a59b83240e4b04a4e13 (diff)
downloadglibc-0f124303c8bebc3258d2d22bdc03271e85b9ea42.tar
glibc-0f124303c8bebc3258d2d22bdc03271e85b9ea42.tar.gz
glibc-0f124303c8bebc3258d2d22bdc03271e85b9ea42.tar.bz2
glibc-0f124303c8bebc3258d2d22bdc03271e85b9ea42.zip
Update.
2003-09-24 Jakub Jelinek <jakub@redhat.com> * nscd/Makefile (others): Add nscd before including ../Rules.
Diffstat (limited to 'nscd')
-rw-r--r--nscd/Makefile5
1 files changed, 3 insertions, 2 deletions
diff --git a/nscd/Makefile b/nscd/Makefile
index 19875fb5e6..7392e71509 100644
--- a/nscd/Makefile
+++ b/nscd/Makefile
@@ -35,6 +35,9 @@ nscd-modules := nscd connections pwdcache getpwnam_r getpwuid_r grpcache \
ifeq ($(have-thread-library),yes)
others := nscd_nischeck
+ifneq (yesyes,$(have-fpie)$(build-shared))
+others += nscd
+endif
install-sbin := nscd nscd_nischeck
extra-objs := $(nscd-modules:=.o) nscd_nischeck.o
@@ -84,8 +87,6 @@ $(objpfx)nscd: $(addprefix $(objpfx),$(nscd-modules:=.o))
$(LDFLAGS) $(LDFLAGS-$(@F)) \
-L$(subst :, -L,$(rpath-link)) -Wl,-rpath-link=$(rpath-link) \
-o $@ $^ $(common-objpfx)libc_nonshared.a
-else
-others += nscd
endif
# This makes sure -DNOT_IN_libc is passed for all these modules.