Cope without sunrpc.

2 files changed, 11 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 8ae4979335..e73a301361 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2013-08-27  Roland McGrath  <roland@hack.frob.com>
 
+	* Makefile ($(common-objpfx)linkobj/libc_pic.a):
+	If [sunrpc not in $(subdirs)], define to use libc_pic.a directly.
+
 	* resolv/res_send.c (send_dg): Don't try to use ioctl unless [FIONREAD].
 
 	* resolv/res_hconf.c [!NOT_IN_libc] (ifaddrs): Declare
diff --git a/Makefile b/Makefile
index 119bb26c39..ba1820d2b2 100644
--- a/Makefile
+++ b/Makefile
@@ -138,16 +138,22 @@ $(common-objpfx)linkobj/libc.so: $(elfobjdir)/soinit.os \
 				 $(shlib-lds)
 	$(build-shlib)
 
+ifeq (,$(filter sunrpc,$(subdirs)))
+$(common-objpfx)linkobj/libc_pic.a: $(common-objpfx)libc_pic.a
+	$(make-target-directory)
+	ln -f $< $@
+else
 $(common-objpfx)linkobj/libc_pic.a: $(common-objpfx)libc_pic.a \
 				    $(common-objpfx)sunrpc/librpc_compat_pic.a
-	$(..)./scripts/mkinstalldirs $(common-objpfx)linkobj
+	$(make-target-directory)
 	(cd $(common-objpfx)linkobj; \
 	 $(AR) x ../libc_pic.a; \
 	 rm $$($(AR) t ../sunrpc/librpc_compat_pic.a | sed 's/^compat-//'); \
 	 $(AR) x ../sunrpc/librpc_compat_pic.a; \
 	 $(AR) cr libc_pic.a *.os; \
 	 rm *.os)
-endif
+endif # $(subdirs) contains sunrpc
+endif # $(build-shared)
 
 
 # This is a handy script for running any dynamically linked program against