From: Siddhesh Poyarekar <siddhesh@redhat.com>
Date: Fri, 4 Jul 2014 01:52:51 +0000 (-0700)
Subject: Restore subdir conditional for tst-timer dependency.
X-Git-Tag: glibc-2.20~147
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=38851324d820b7cf8b8e9694e7c33325c16f38db;p=thirdparty%2Fglibc.git

Restore subdir conditional for tst-timer dependency.
---

diff --git a/ChangeLog b/ChangeLog
index 5eb0d431e64..0a8688a1cee 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2014-07-03  Roland McGrath  <roland@hack.frob.com>
+
+	* sysdeps/pthread/Makefile: Conditionalize tst-timer bits (the only
+	thing) with "ifeq ($(subdir),rt)".
+
 2014-07-03  Richard Henderson  <rth@redhat.com>
 
 	* sysdeps/alpha/fpu/s_nearbyintf.c: Remove file.
diff --git a/sysdeps/pthread/Makefile b/sysdeps/pthread/Makefile
index 1080dc91269..47e61bd07a0 100644
--- a/sysdeps/pthread/Makefile
+++ b/sysdeps/pthread/Makefile
@@ -16,8 +16,12 @@
 # License along with the GNU C Library; if not, see
 # <http://www.gnu.org/licenses/>.
 
+ifeq ($(subdir),rt)
+
 ifeq (yes,$(build-shared))
 $(objpfx)tst-timer: $(objpfx)librt.so $(shared-thread-library)
 else
 $(objpfx)tst-timer: $(objpfx)librt.a $(static-thread-library)
 endif
+
+endif