about summary refs log tree commit diff
diff options
context:
space:
mode:
authorFlorian Weimer <fweimer@redhat.com>2021-06-21 08:25:15 +0200
committerFlorian Weimer <fweimer@redhat.com>2021-06-21 08:25:15 +0200
commita2014d311b2b2a7d8fcf2f502493404d7ec2601c (patch)
tree2fb5e9df8374d6dbfe3655014961b0a6f508672c
parentf6b6e148695aed6bfb8211953981a87ffe17343f (diff)
downloadglibc-a2014d311b2b2a7d8fcf2f502493404d7ec2601c.tar.gz
glibc-a2014d311b2b2a7d8fcf2f502493404d7ec2601c.tar.xz
glibc-a2014d311b2b2a7d8fcf2f502493404d7ec2601c.zip
Fix librt-routines-var issues for !PTHREAD_IN_LIBC
The variable name was incorrect, and the existing librt-routines
variable needs to be augmented (not assigned) in rt/Makefile.

Reviewed-by: Adhemerval Zanella  <adhemerval.zanella@linaro.org>
-rw-r--r--Makeconfig2
-rw-r--r--rt/Makefile2
2 files changed, 2 insertions, 2 deletions
diff --git a/Makeconfig b/Makeconfig
index 6482a43025..407df9e6a1 100644
--- a/Makeconfig
+++ b/Makeconfig
@@ -1344,7 +1344,7 @@ libpthread-routines-var = routines
 librt-routines-var = routines
 else
 libpthread-routines-var = libpthread-routines
-librt-routines-var = libpthread-routines
+librt-routines-var = librt-routines
 endif
 
 # A sysdeps Makeconfig fragment may set libc-reentrant to yes.
diff --git a/rt/Makefile b/rt/Makefile
index b0d887202d..47bc594dee 100644
--- a/rt/Makefile
+++ b/rt/Makefile
@@ -57,7 +57,7 @@ librt-routines = \
   timer_gettime \
   timer_settime \
 
-$(librt-routines-var) = \
+$(librt-routines-var) += \
 
 tests := tst-shm tst-timer tst-timer2 \
 	 tst-aio tst-aio64 tst-aio2 tst-aio3 tst-aio4 tst-aio5 tst-aio6 \