about summary refs log tree commit diff
path: root/nptl
diff options
context:
space:
mode:
authorPalmer Dabbelt <palmer@dabbelt.com>2017-12-26 20:56:44 -0800
committerPalmer Dabbelt <palmer@dabbelt.com>2018-01-06 23:42:21 -0800
commit8e13c51bb579d56b52e93a058c9efb0bbab35d1b (patch)
tree5e26a5b8fc6660c91460c9b8903faa9240f1d5a9 /nptl
parent1598f3ad06db9654a5d112136e40b630649405c3 (diff)
downloadglibc-8e13c51bb579d56b52e93a058c9efb0bbab35d1b.tar.gz
glibc-8e13c51bb579d56b52e93a058c9efb0bbab35d1b.tar.xz
glibc-8e13c51bb579d56b52e93a058c9efb0bbab35d1b.zip
Avoid race conditions when rebuilding librt.so
`make check' sometimes triggers a rebuild of librt.so using
nptl/Makefile, which ignores librt's dependence on libpthread.  This
causes the build to blow up when we attempt to run the test suite on
RISC-V.

2018-01-06  Palmer Dabbelt  <palmer@sifive.com>

        * nptl/Makefile (/librt.so): Always depend on
        "$(shared-thread-library)".
Diffstat (limited to 'nptl')
-rw-r--r--nptl/Makefile4
1 files changed, 4 insertions, 0 deletions
diff --git a/nptl/Makefile b/nptl/Makefile
index d7ed500707..48b7e4bc9e 100644
--- a/nptl/Makefile
+++ b/nptl/Makefile
@@ -612,6 +612,10 @@ else
 librt = $(common-objpfx)rt/librt.a
 endif
 
+# `make check' sometimes triggers a rebuild of librt.so using this Makefile,
+# which ignores librt's dependence on libpthread
+$(common-objpfx)rt/librt.so: $(shared-thread-library)
+
 $(objpfx)tst-cancel17: $(librt)
 $(objpfx)tst-cancelx17: $(librt)
 $(objpfx)tst-_res1mod2.so: $(objpfx)tst-_res1mod1.so