about summary refs log tree commit diff
path: root/nss
diff options
context:
space:
mode:
authorPaul Pluzhnikov <ppluzhnikov@google.com>2012-03-23 09:47:03 -0700
committerPaul Pluzhnikov <ppluzhnikov@google.com>2012-03-23 09:47:03 -0700
commit3ff4252677ff55a0dd4ded5b5cbccda25812ba12 (patch)
tree89597f9e39e86be0025860a863ee2fca63d63894 /nss
parent7c69cd143bacc3dbb7daeac4abf08a321aeeb185 (diff)
downloadglibc-3ff4252677ff55a0dd4ded5b5cbccda25812ba12.tar.gz
glibc-3ff4252677ff55a0dd4ded5b5cbccda25812ba12.tar.xz
glibc-3ff4252677ff55a0dd4ded5b5cbccda25812ba12.zip
2012-03-23 Daniel Jacobowitz <dmj@google.com>
	Paul Pluzhnikov  <ppluzhnikov@google.com>

	[BZ #6528]
	* grp/Makefile (otherlibs): Don't set it.
	* inet/Makefile (otherlibs): Likewise.
	* login/Makefile (otherlibs): Likewise.
	* nscd/Makefile (otherlibs): Likewise.
	* posix/Makefile (otherlibs): Likewise.
	* pwd/Makefile (otherlibs): Likewise.
	* rt/Makefile (otherlibs): Likewise.
	* sunrpc/Makefile (otherlibs): Likewise.
	* nss/Makefile (otherlibs): Likewise.
	Add libnss_files to routines and static-only-routines.
	($(objpfx)getent): Remove rule.
	* resolv/Makefile: Add libnss_dns and libresolv to routines and
	static-only-routines.
Diffstat (limited to 'nss')
-rw-r--r--nss/Makefile16
1 files changed, 4 insertions, 12 deletions
diff --git a/nss/Makefile b/nss/Makefile
index 13accaa01d..54d50d051c 100644
--- a/nss/Makefile
+++ b/nss/Makefile
@@ -43,11 +43,6 @@ xtests			= bug-erange
 
 include ../Makeconfig
 
-ifeq (yes,$(build-static-nss))
-otherlibs += $(nssobjdir)/libnss_files.a $(resolvobjdir)/libnss_dns.a \
-	     $(resolvobjdir)/libresolv.a
-endif
-
 # Specify rules for the nss_* modules.  We have some services.
 services		:= files db
 
@@ -74,19 +69,16 @@ generated		+= $(filter-out db-alias.c db-netgrp.c, \
 
 install-others		+= $(inst_vardbdir)/Makefile
 
-# Build static module if requested
-ifneq ($(build-static-nss),yes)
+# Build static module into libc if requested
 libnss_files-inhibit-o	= $(filter-out .os,$(object-suffixes))
 libnss_db-inhibit-o	= $(filter-out .os,$(object-suffixes))
+ifeq ($(build-static-nss),yes)
+routines                += $(libnss_files-routines)
+static-only-routines    += $(libnss_files-routines)
 endif
 
 include ../Rules
 
-
-ifeq (yes,$(build-static-nss))
-$(objpfx)getent: $(objpfx)libnss_files.a
-endif
-
 ifeq (yes,$(have-selinux))
 LDLIBS-makedb		:= -lselinux
 endif