diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | sysdeps/pthread/Makefile | 4 |
2 files changed, 9 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog index 5eb0d431e6..0a8688a1ce 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 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 # <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 |