about summary refs log tree commit diff
diff options
context:
space:
mode:
authorAndreas Schwab <schwab@linux-m68k.org>2018-01-26 19:01:03 +0100
committerAndreas Schwab <schwab@linux-m68k.org>2018-01-26 19:03:44 +0100
commit5503f413bf4221d26f83333bb42d7b2cd056236c (patch)
tree7ec6655bb0d6bf60402600b52c27ccf9571081fd
parentcaaf7804e26c1a4f28a1bf7cfe1075d06bce1255 (diff)
downloadglibc-5503f413bf4221d26f83333bb42d7b2cd056236c.tar.gz
glibc-5503f413bf4221d26f83333bb42d7b2cd056236c.tar.xz
glibc-5503f413bf4221d26f83333bb42d7b2cd056236c.zip
Build only shared libnsl objects if NIS is disabled (bug 22701)
-rw-r--r--ChangeLog6
-rw-r--r--nis/Makefile3
2 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 711eb4fd08..78d1338443 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 01ec4dc357..e7497f7242 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)