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 /sysdeps/htl | |
| 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 'sysdeps/htl')
| -rw-r--r-- | sysdeps/htl/Makeconfig | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/sysdeps/htl/Makeconfig b/sysdeps/htl/Makeconfig index e8a8f405b0..b5c5d62b74 100644 --- a/sysdeps/htl/Makeconfig +++ b/sysdeps/htl/Makeconfig @@ -7,4 +7,10 @@ shared-thread-library = $(common-objpfx)htl/libpthread.so static-thread-library = $(..)htl/libpthread_syms.a $(common-objpfx)htl/libpthread.a bounded-thread-library = $(static-thread-library) +ifeq (yes,$(build-shared)) +librt = $(common-objpfx)rt/librt.so +else +librt = $(common-objpfx)rt/librt.a $(static-thread-library) +endif + rpath-dirs += htl |