summaryrefslogtreecommitdiff
path: root/resolv
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 /resolv
parent7c69cd143bacc3dbb7daeac4abf08a321aeeb185 (diff)
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 'resolv')
-rw-r--r--resolv/Makefile4
1 files changed, 3 insertions, 1 deletions
diff --git a/resolv/Makefile b/resolv/Makefile
index d87119385b..4777317b17 100644
--- a/resolv/Makefile
+++ b/resolv/Makefile
@@ -55,8 +55,10 @@ subdir-dirs = nss_dns
vpath %.c nss_dns
libnss_dns-routines := dns-host dns-network dns-canon
-ifneq ($(build-static-nss),yes)
libnss_dns-inhibit-o = $(filter-out .os,$(object-suffixes))
+ifeq ($(build-static-nss),yes)
+routines += $(libnss_dns-routines) $(libresolv-routines)
+static-only-routines += $(libnss_dns-routines) $(libresolv-routines)
endif
ifeq (yesyes,$(build-shared)$(have-thread-library))