about summary refs log tree commit diff
path: root/nss/Makefile
diff options
context:
space:
mode:
authorJoseph Myers <joseph@codesourcery.com>2013-05-31 16:16:33 +0000
committerJoseph Myers <joseph@codesourcery.com>2013-05-31 16:16:33 +0000
commitfab7ce3f5b4060bf62659e8b58529de4156b5a2f (patch)
tree478613d49200afe992092d00c61f6fb82cec07b8 /nss/Makefile
parenteca5920cd90093d8921f27bfbf7bcf54807165bb (diff)
downloadglibc-fab7ce3f5b4060bf62659e8b58529de4156b5a2f.tar.gz
glibc-fab7ce3f5b4060bf62659e8b58529de4156b5a2f.tar.xz
glibc-fab7ce3f5b4060bf62659e8b58529de4156b5a2f.zip
Link extra-libs consistently with libc and ld.so.
Diffstat (limited to 'nss/Makefile')
-rw-r--r--nss/Makefile12
1 files changed, 5 insertions, 7 deletions
diff --git a/nss/Makefile b/nss/Makefile
index 553eafaa6b..ae2e5f6d5a 100644
--- a/nss/Makefile
+++ b/nss/Makefile
@@ -84,12 +84,11 @@ ifeq (yes,$(have-selinux))
 LDLIBS-makedb		:= -lselinux
 endif
 
-# Depend on libc.so so a DT_NEEDED is generated in the shared objects.
-# This ensures they will load libc.so for needed symbols if loaded by
-# a statically-linked program that hasn't already loaded it.
 libnss-libc = $(common-objpfx)linkobj/libc.so
-$(services:%=$(objpfx)libnss_%.so): $(libnss-libc) \
-				    $(common-objpfx)libc_nonshared.a
+# Target-specific variable setting to link objects using deprecated
+# RPC interfaces with the version of libc.so that makes them available
+# for new links:
+$(services:%=$(objpfx)libnss_%.so): libc-for-link = $(libnss-libc)
 
 $(objpfx)libnss_db.so: $(objpfx)libnss_files.so
 
@@ -107,8 +106,7 @@ $(inst_vardbdir)/Makefile: db-Makefile $(+force)
 	$(do-install)
 
 CFLAGS-nss_test1.c = -DNOT_IN_libc=1
-$(objpfx)/libnss_test1.so: $(objpfx)nss_test1.os $(common-objpfx)libc.so \
-			   $(common-objpfx)libc_nonshared.a
+$(objpfx)/libnss_test1.so: $(objpfx)nss_test1.os $(link-libc-deps)
 	$(build-module)
 ifdef libnss_test1.so-version
 $(objpfx)/libnss_test1.so$(libnss_test1.so-version): $(objpfx)/libnss_test1.so