[02/34] Fix librt-routines-var issues for !PTHREAD_IN_LIBC

Message ID 79d494dbcefe3a86a60db3c29396c6db7fe74d14.1623956057.git.fweimer@redhat.com
State New
Headers show
Series
  • Move librt into libc
Related show

Commit Message

DJ Delorie via Libc-alpha June 17, 2021, 6:56 p.m.
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>

---
 Makeconfig  | 2 +-
 rt/Makefile | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

-- 
2.31.1

Patch

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 \