diff options
| author | Florian Weimer <fweimer@redhat.com> | 2021-06-28 09:51:01 +0200 |
|---|---|---|
| committer | Florian Weimer <fweimer@redhat.com> | 2021-06-28 09:51:01 +0200 |
| commit | 30639e79d3370243ee5ef3a029204a4c71e15856 (patch) | |
| tree | 4e3f8d5501fbcb5ab1155a3a6cd7f8161863055c /rt/Makefile | |
| parent | 477910b83e5ef3b3aa78b11808433846989461c8 (diff) | |
| download | glibc-30639e79d3370243ee5ef3a029204a4c71e15856.tar.gz glibc-30639e79d3370243ee5ef3a029204a4c71e15856.tar.xz glibc-30639e79d3370243ee5ef3a029204a4c71e15856.zip | |
Linux: Cleanups after librt move
librt.so is no longer installed for PTHREAD_IN_LIBC, and tests are not linked against it. $(librt) is introduced globally for shared tests that need to be linked for both PTHREAD_IN_LIBC and !PTHREAD_IN_LIBC. GLIBC_PRIVATE symbols that were needed during the transition are removed again. Reviewed-by: Carlos O'Donell <carlos@redhat.com>
Diffstat (limited to 'rt/Makefile')
| -rw-r--r-- | rt/Makefile | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/rt/Makefile b/rt/Makefile index f8a47622d0..113cea03a5 100644 --- a/rt/Makefile +++ b/rt/Makefile @@ -28,9 +28,7 @@ routines = \ shm_open \ shm_unlink \ -librt-routines = \ - librt-compat \ - +librt-routines = librt-compat librt-shared-only-routines = librt-compat $(librt-routines-var) += \ @@ -64,6 +62,13 @@ $(librt-routines-var) += \ timer_gettime \ timer_settime \ +ifeq ($(pthread-in-libc),yes) +# Pretend that librt.so is a linker script, so that the symbolic +# link is not installed. +install-lib-ldscripts = librt.so +$(inst_libdir)/librt.so: +endif + tests := tst-shm tst-timer tst-timer2 \ tst-aio tst-aio64 tst-aio2 tst-aio3 tst-aio4 tst-aio5 tst-aio6 \ tst-aio7 tst-aio8 tst-aio9 tst-aio10 \ @@ -98,6 +103,7 @@ LDFLAGS-rt.so = -Wl,--enable-new-dtags,-z,nodelete $(objpfx)librt.so: $(shared-thread-library) +ifneq ($(pthread-in-libc),yes) ifeq (yes,$(build-shared)) $(addprefix $(objpfx),$(tests) $(tests-internal)): \ $(objpfx)librt.so $(shared-thread-library) @@ -105,5 +111,6 @@ else $(addprefix $(objpfx),$(tests)) $(tests-internal): \ $(objpfx)librt.a $(static-thread-library) endif +endif # !$(pthread-in-libc) tst-mqueue7-ARGS = -- $(host-test-program-cmd) |