From 5503f413bf4221d26f83333bb42d7b2cd056236c Mon Sep 17 00:00:00 2001
From: Andreas Schwab <schwab@linux-m68k.org>
Date: Fri, 26 Jan 2018 19:01:03 +0100
Subject: [PATCH] Build only shared libnsl objects if NIS is disabled (bug
 22701)

---
 ChangeLog    | 6 ++++++
 nis/Makefile | 3 ++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 711eb4fd082..78d13384435 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2018-01-26  Andreas Schwab  <schwab@linux-m68k.org>
+
+	[BZ #22701]
+	* nis/Makefile (libnsl-inhibit-o) [$(build-obsolete-nsl) != yes]:
+	Build only shared objects.
+
 2018-01-26  Carlos O'Donell  <carlos@redhat.com>
 
 	* README: Update for hppa.
diff --git a/nis/Makefile b/nis/Makefile
index 01ec4dc3574..e7497f72424 100644
--- a/nis/Makefile
+++ b/nis/Makefile
@@ -74,7 +74,8 @@ else # not $(build-obsolete-nsl)
 # is not installed.
 install-lib-ldscripts = libnsl.so
 $(inst_libdir)/libnsl.so:
-libnsl-inhibit-o = .o # Build no static libnsl.a.
+# Build only shared libnsl.
+libnsl-inhibit-o = $(filter-out .os,$(object-suffixes))
 
 endif # not $(build-obsolete-nsl)
 
-- 
2.47.2