27 files changed, 54 insertions, 0 deletions

diff --git a/libexec/atrun/Makefile.depend b/libexec/atrun/Makefile.depend
index 5947196b49e41..3d8c2f306ad00 100644
--- a/libexec/atrun/Makefile.depend
+++ b/libexec/atrun/Makefile.depend
@@ -3,11 +3,13 @@
 DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
 
 DIRDEPS = \
+	gnu/lib/csu \
 	gnu/lib/libgcc \
 	include \
 	include/xlocale \
 	lib/${CSU_DIR} \
 	lib/libc \
+	lib/libc_nonshared \
 	lib/libcompiler_rt \
 	lib/libpam/libpam \
 	lib/libutil \
diff --git a/libexec/bootpd/bootpgw/Makefile.depend b/libexec/bootpd/bootpgw/Makefile.depend
index 26cf1959f6fea..5269280d143cc 100644
--- a/libexec/bootpd/bootpgw/Makefile.depend
+++ b/libexec/bootpd/bootpgw/Makefile.depend
@@ -3,12 +3,14 @@
 DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
 
 DIRDEPS = \
+	gnu/lib/csu \
 	gnu/lib/libgcc \
 	include \
 	include/arpa \
 	include/xlocale \
 	lib/${CSU_DIR} \
 	lib/libc \
+	lib/libc_nonshared \
 	lib/libcompiler_rt \
 
 
diff --git a/libexec/bootpd/tools/bootpef/Makefile.depend b/libexec/bootpd/tools/bootpef/Makefile.depend
index 26cf1959f6fea..5269280d143cc 100644
--- a/libexec/bootpd/tools/bootpef/Makefile.depend
+++ b/libexec/bootpd/tools/bootpef/Makefile.depend
@@ -3,12 +3,14 @@
 DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
 
 DIRDEPS = \
+	gnu/lib/csu \
 	gnu/lib/libgcc \
 	include \
 	include/arpa \
 	include/xlocale \
 	lib/${CSU_DIR} \
 	lib/libc \
+	lib/libc_nonshared \
 	lib/libcompiler_rt \
 
 
diff --git a/libexec/bootpd/tools/bootptest/Makefile.depend b/libexec/bootpd/tools/bootptest/Makefile.depend
index 26cf1959f6fea..5269280d143cc 100644
--- a/libexec/bootpd/tools/bootptest/Makefile.depend
+++ b/libexec/bootpd/tools/bootptest/Makefile.depend
@@ -3,12 +3,14 @@
 DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
 
 DIRDEPS = \
+	gnu/lib/csu \
 	gnu/lib/libgcc \
 	include \
 	include/arpa \
 	include/xlocale \
 	lib/${CSU_DIR} \
 	lib/libc \
+	lib/libc_nonshared \
 	lib/libcompiler_rt \
 
 
diff --git a/libexec/comsat/Makefile.depend b/libexec/comsat/Makefile.depend
index 65ce5679ccda0..6caf55f2706e0 100644
--- a/libexec/comsat/Makefile.depend
+++ b/libexec/comsat/Makefile.depend
@@ -3,11 +3,13 @@
 DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
 
 DIRDEPS = \
+	gnu/lib/csu \
 	gnu/lib/libgcc \
 	include \
 	include/xlocale \
 	lib/${CSU_DIR} \
 	lib/libc \
+	lib/libc_nonshared \
 	lib/libcompiler_rt \
 
 
diff --git a/libexec/fingerd/Makefile.depend b/libexec/fingerd/Makefile.depend
index ee948eaa011ec..e3af08532eec4 100644
--- a/libexec/fingerd/Makefile.depend
+++ b/libexec/fingerd/Makefile.depend
@@ -3,12 +3,14 @@
 DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
 
 DIRDEPS = \
+	gnu/lib/csu \
 	gnu/lib/libgcc \
 	include \
 	include/arpa \
 	include/xlocale \
 	lib/${CSU_DIR} \
 	lib/libc \
+	lib/libc_nonshared \
 	lib/libcompiler_rt \
 	lib/libutil \
 
diff --git a/libexec/ftpd/Makefile.depend b/libexec/ftpd/Makefile.depend
index 44ee786b7e19c..a648938b6ff49 100644
--- a/libexec/ftpd/Makefile.depend
+++ b/libexec/ftpd/Makefile.depend
@@ -3,12 +3,14 @@
 DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
 
 DIRDEPS = \
+	gnu/lib/csu \
 	gnu/lib/libgcc \
 	include \
 	include/arpa \
 	include/xlocale \
 	lib/${CSU_DIR} \
 	lib/libc \
+	lib/libc_nonshared \
 	lib/libcompiler_rt \
 	lib/libcrypt \
 	lib/libmd \
diff --git a/libexec/getty/Makefile.depend b/libexec/getty/Makefile.depend
index afbe02588041e..40b445f047795 100644
--- a/libexec/getty/Makefile.depend
+++ b/libexec/getty/Makefile.depend
@@ -3,11 +3,13 @@
 DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
 
 DIRDEPS = \
+	gnu/lib/csu \
 	gnu/lib/libgcc \
 	include \
 	include/xlocale \
 	lib/${CSU_DIR} \
 	lib/libc \
+	lib/libc_nonshared \
 	lib/libcompiler_rt \
 	lib/libutil \
 
diff --git a/libexec/mail.local/Makefile.depend b/libexec/mail.local/Makefile.depend
index 1d3e8d899246e..d4bbfb2aa92ac 100644
--- a/libexec/mail.local/Makefile.depend
+++ b/libexec/mail.local/Makefile.depend
@@ -3,12 +3,14 @@
 DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
 
 DIRDEPS = \
+	gnu/lib/csu \
 	gnu/lib/libgcc \
 	include \
 	include/arpa \
 	include/xlocale \
 	lib/${CSU_DIR} \
 	lib/libc \
+	lib/libc_nonshared \
 	lib/libcompiler_rt \
 	lib/libsm \
 	lib/libutil \
diff --git a/libexec/mknetid/Makefile.depend b/libexec/mknetid/Makefile.depend
index d074335f44664..5930524f9ce7f 100644
--- a/libexec/mknetid/Makefile.depend
+++ b/libexec/mknetid/Makefile.depend
@@ -3,6 +3,7 @@
 DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
 
 DIRDEPS = \
+	gnu/lib/csu \
 	gnu/lib/libgcc \
 	include \
 	include/rpc \
@@ -10,6 +11,7 @@ DIRDEPS = \
 	include/xlocale \
 	lib/${CSU_DIR} \
 	lib/libc \
+	lib/libc_nonshared \
 	lib/libcompiler_rt \
 
 
diff --git a/libexec/pppoed/Makefile.depend b/libexec/pppoed/Makefile.depend
index 2b972daf01f6c..a2060055a2421 100644
--- a/libexec/pppoed/Makefile.depend
+++ b/libexec/pppoed/Makefile.depend
@@ -3,12 +3,14 @@
 DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
 
 DIRDEPS = \
+	gnu/lib/csu \
 	gnu/lib/libgcc \
 	include \
 	include/arpa \
 	include/xlocale \
 	lib/${CSU_DIR} \
 	lib/libc \
+	lib/libc_nonshared \
 	lib/libcompiler_rt \
 	lib/libnetgraph \
 
diff --git a/libexec/rbootd/Makefile.depend b/libexec/rbootd/Makefile.depend
index 65ce5679ccda0..6caf55f2706e0 100644
--- a/libexec/rbootd/Makefile.depend
+++ b/libexec/rbootd/Makefile.depend
@@ -3,11 +3,13 @@
 DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
 
 DIRDEPS = \
+	gnu/lib/csu \
 	gnu/lib/libgcc \
 	include \
 	include/xlocale \
 	lib/${CSU_DIR} \
 	lib/libc \
+	lib/libc_nonshared \
 	lib/libcompiler_rt \
 
 
diff --git a/libexec/revnetgroup/Makefile.depend b/libexec/revnetgroup/Makefile.depend
index 65ce5679ccda0..6caf55f2706e0 100644
--- a/libexec/revnetgroup/Makefile.depend
+++ b/libexec/revnetgroup/Makefile.depend
@@ -3,11 +3,13 @@
 DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
 
 DIRDEPS = \
+	gnu/lib/csu \
 	gnu/lib/libgcc \
 	include \
 	include/xlocale \
 	lib/${CSU_DIR} \
 	lib/libc \
+	lib/libc_nonshared \
 	lib/libcompiler_rt \
 
 
diff --git a/libexec/rlogind/Makefile.depend b/libexec/rlogind/Makefile.depend
index ee948eaa011ec..e3af08532eec4 100644
--- a/libexec/rlogind/Makefile.depend
+++ b/libexec/rlogind/Makefile.depend
@@ -3,12 +3,14 @@
 DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
 
 DIRDEPS = \
+	gnu/lib/csu \
 	gnu/lib/libgcc \
 	include \
 	include/arpa \
 	include/xlocale \
 	lib/${CSU_DIR} \
 	lib/libc \
+	lib/libc_nonshared \
 	lib/libcompiler_rt \
 	lib/libutil \
 
diff --git a/libexec/rpc.rquotad/Makefile.depend b/libexec/rpc.rquotad/Makefile.depend
index 74982d7fcb453..27a6a4a115b8c 100644
--- a/libexec/rpc.rquotad/Makefile.depend
+++ b/libexec/rpc.rquotad/Makefile.depend
@@ -3,6 +3,7 @@
 DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
 
 DIRDEPS = \
+	gnu/lib/csu \
 	gnu/lib/libgcc \
 	include \
 	include/arpa \
@@ -11,6 +12,7 @@ DIRDEPS = \
 	include/xlocale \
 	lib/${CSU_DIR} \
 	lib/libc \
+	lib/libc_nonshared \
 	lib/libcompiler_rt \
 	lib/librpcsvc \
 	lib/libutil \
diff --git a/libexec/rpc.rstatd/Makefile.depend b/libexec/rpc.rstatd/Makefile.depend
index 35a6e3704da8e..e7870b4b49c37 100644
--- a/libexec/rpc.rstatd/Makefile.depend
+++ b/libexec/rpc.rstatd/Makefile.depend
@@ -3,6 +3,7 @@
 DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
 
 DIRDEPS = \
+	gnu/lib/csu \
 	gnu/lib/libgcc \
 	include \
 	include/rpc \
@@ -10,6 +11,7 @@ DIRDEPS = \
 	include/xlocale \
 	lib/${CSU_DIR} \
 	lib/libc \
+	lib/libc_nonshared \
 	lib/libcompiler_rt \
 	lib/libdevstat \
 	lib/libkvm \
diff --git a/libexec/rpc.rusersd/Makefile.depend b/libexec/rpc.rusersd/Makefile.depend
index f3b4295fa83f6..8d990c379a157 100644
--- a/libexec/rpc.rusersd/Makefile.depend
+++ b/libexec/rpc.rusersd/Makefile.depend
@@ -3,6 +3,7 @@
 DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
 
 DIRDEPS = \
+	gnu/lib/csu \
 	gnu/lib/libgcc \
 	include \
 	include/rpc \
@@ -10,6 +11,7 @@ DIRDEPS = \
 	include/xlocale \
 	lib/${CSU_DIR} \
 	lib/libc \
+	lib/libc_nonshared \
 	lib/libcompiler_rt \
 	lib/librpcsvc \
 	lib/libutil \
diff --git a/libexec/rpc.rwalld/Makefile.depend b/libexec/rpc.rwalld/Makefile.depend
index bd7098e0b6ce5..d9693fd647523 100644
--- a/libexec/rpc.rwalld/Makefile.depend
+++ b/libexec/rpc.rwalld/Makefile.depend
@@ -3,6 +3,7 @@
 DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
 
 DIRDEPS = \
+	gnu/lib/csu \
 	gnu/lib/libgcc \
 	include \
 	include/arpa \
@@ -11,6 +12,7 @@ DIRDEPS = \
 	include/xlocale \
 	lib/${CSU_DIR} \
 	lib/libc \
+	lib/libc_nonshared \
 	lib/libcompiler_rt \
 	lib/libutil \
 
diff --git a/libexec/rpc.sprayd/Makefile.depend b/libexec/rpc.sprayd/Makefile.depend
index 6514930150d7e..3b0eba6af4e15 100644
--- a/libexec/rpc.sprayd/Makefile.depend
+++ b/libexec/rpc.sprayd/Makefile.depend
@@ -3,6 +3,7 @@
 DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
 
 DIRDEPS = \
+	gnu/lib/csu \
 	gnu/lib/libgcc \
 	include \
 	include/rpc \
@@ -10,6 +11,7 @@ DIRDEPS = \
 	include/xlocale \
 	lib/${CSU_DIR} \
 	lib/libc \
+	lib/libc_nonshared \
 	lib/libcompiler_rt \
 	lib/librpcsvc \
 
diff --git a/libexec/rshd/Makefile.depend b/libexec/rshd/Makefile.depend
index 9473758ae4656..e513c61c35481 100644
--- a/libexec/rshd/Makefile.depend
+++ b/libexec/rshd/Makefile.depend
@@ -3,12 +3,14 @@
 DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
 
 DIRDEPS = \
+	gnu/lib/csu \
 	gnu/lib/libgcc \
 	include \
 	include/arpa \
 	include/xlocale \
 	lib/${CSU_DIR} \
 	lib/libc \
+	lib/libc_nonshared \
 	lib/libcompiler_rt \
 	lib/libpam/libpam \
 	lib/libutil \
diff --git a/libexec/smrsh/Makefile.depend b/libexec/smrsh/Makefile.depend
index 6515b7d984daf..47096166cc737 100644
--- a/libexec/smrsh/Makefile.depend
+++ b/libexec/smrsh/Makefile.depend
@@ -3,11 +3,13 @@
 DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
 
 DIRDEPS = \
+	gnu/lib/csu \
 	gnu/lib/libgcc \
 	include \
 	include/xlocale \
 	lib/${CSU_DIR} \
 	lib/libc \
+	lib/libc_nonshared \
 	lib/libcompiler_rt \
 	lib/libsm \
 	lib/libutil \
diff --git a/libexec/talkd/Makefile.depend b/libexec/talkd/Makefile.depend
index 48e46367c59a0..11fa4d730adce 100644
--- a/libexec/talkd/Makefile.depend
+++ b/libexec/talkd/Makefile.depend
@@ -3,6 +3,7 @@
 DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
 
 DIRDEPS = \
+	gnu/lib/csu \
 	gnu/lib/libgcc \
 	include \
 	include/arpa \
@@ -10,6 +11,7 @@ DIRDEPS = \
 	include/xlocale \
 	lib/${CSU_DIR} \
 	lib/libc \
+	lib/libc_nonshared \
 	lib/libcompiler_rt \
 
 
diff --git a/libexec/tcpd/Makefile.depend b/libexec/tcpd/Makefile.depend
index 52befbc6e6ade..8452af99c632f 100644
--- a/libexec/tcpd/Makefile.depend
+++ b/libexec/tcpd/Makefile.depend
@@ -3,11 +3,13 @@
 DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
 
 DIRDEPS = \
+	gnu/lib/csu \
 	gnu/lib/libgcc \
 	include \
 	include/xlocale \
 	lib/${CSU_DIR} \
 	lib/libc \
+	lib/libc_nonshared \
 	lib/libcompiler_rt \
 	lib/libwrap \
 
diff --git a/libexec/tftp-proxy/Makefile.depend b/libexec/tftp-proxy/Makefile.depend
index 26cf1959f6fea..5269280d143cc 100644
--- a/libexec/tftp-proxy/Makefile.depend
+++ b/libexec/tftp-proxy/Makefile.depend
@@ -3,12 +3,14 @@
 DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
 
 DIRDEPS = \
+	gnu/lib/csu \
 	gnu/lib/libgcc \
 	include \
 	include/arpa \
 	include/xlocale \
 	lib/${CSU_DIR} \
 	lib/libc \
+	lib/libc_nonshared \
 	lib/libcompiler_rt \
 
 
diff --git a/libexec/tftpd/Makefile.depend b/libexec/tftpd/Makefile.depend
index 74a1dd9afe701..a02eba6f2277b 100644
--- a/libexec/tftpd/Makefile.depend
+++ b/libexec/tftpd/Makefile.depend
@@ -3,12 +3,14 @@
 DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
 
 DIRDEPS = \
+	gnu/lib/csu \
 	gnu/lib/libgcc \
 	include \
 	include/arpa \
 	include/xlocale \
 	lib/${CSU_DIR} \
 	lib/libc \
+	lib/libc_nonshared \
 	lib/libcompiler_rt \
 	lib/libwrap \
 
diff --git a/libexec/ulog-helper/Makefile.depend b/libexec/ulog-helper/Makefile.depend
index b1f47e3d7a34f..dfe8b1b467897 100644
--- a/libexec/ulog-helper/Makefile.depend
+++ b/libexec/ulog-helper/Makefile.depend
@@ -3,11 +3,13 @@
 DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
 
 DIRDEPS = \
+	gnu/lib/csu \
 	gnu/lib/libgcc \
 	include \
 	include/xlocale \
 	lib/${CSU_DIR} \
 	lib/libc \
+	lib/libc_nonshared \
 	lib/libcompiler_rt \
 	lib/libmd \
 	lib/libulog \
diff --git a/libexec/ypxfr/Makefile.depend b/libexec/ypxfr/Makefile.depend
index 37e8f0c298b46..9641db9a41760 100644
--- a/libexec/ypxfr/Makefile.depend
+++ b/libexec/ypxfr/Makefile.depend
@@ -3,6 +3,7 @@
 DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
 
 DIRDEPS = \
+	gnu/lib/csu \
 	gnu/lib/libgcc \
 	include \
 	include/arpa \
@@ -11,6 +12,7 @@ DIRDEPS = \
 	include/xlocale \
 	lib/${CSU_DIR} \
 	lib/libc \
+	lib/libc_nonshared \
 	lib/libcompiler_rt \
 	lib/librpcsvc \