From 38851324d820b7cf8b8e9694e7c33325c16f38db Mon Sep 17 00:00:00 2001 From: Siddhesh Poyarekar Date: Thu, 3 Jul 2014 18:52:51 -0700 Subject: [PATCH] Restore subdir conditional for tst-timer dependency. --- ChangeLog | 5 +++++ sysdeps/pthread/Makefile | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/ChangeLog b/ChangeLog index 5eb0d431e6..0a8688a1ce 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2014-07-03 Roland McGrath + + * sysdeps/pthread/Makefile: Conditionalize tst-timer bits (the only + thing) with "ifeq ($(subdir),rt)". + 2014-07-03 Richard Henderson * sysdeps/alpha/fpu/s_nearbyintf.c: Remove file. diff --git a/sysdeps/pthread/Makefile b/sysdeps/pthread/Makefile index 1080dc9126..47e61bd07a 100644 --- a/sysdeps/pthread/Makefile +++ b/sysdeps/pthread/Makefile @@ -16,8 +16,12 @@ # License along with the GNU C Library; if not, see # . +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