diff options
author | Ulrich Drepper <drepper@redhat.com> | 2010-07-01 19:03:29 -0700 |
---|---|---|
committer | Andreas Schwab <schwab@redhat.com> | 2010-12-01 15:35:07 +0100 |
commit | db1bf3f3faf32a13fd38c3c395eaa95400249bd6 (patch) | |
tree | caf8b2596638a98daf1a1255654992cf79609a4f /nptl | |
parent | 5268b1935686d102df4767e08a0135f7b4add353 (diff) | |
download | glibc-db1bf3f3faf32a13fd38c3c395eaa95400249bd6.tar.gz glibc-db1bf3f3faf32a13fd38c3c395eaa95400249bd6.tar.xz glibc-db1bf3f3faf32a13fd38c3c395eaa95400249bd6.zip |
Fix build with newer linker.
(cherry picked from commit 72b6e8c85b95a949d8c5d827a16dd1492d9ef26b)
Diffstat (limited to 'nptl')
-rw-r--r-- | nptl/ChangeLog | 4 | ||||
-rw-r--r-- | nptl/Makefile | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/nptl/ChangeLog b/nptl/ChangeLog index 3da761a29f..a6b98bb24e 100644 --- a/nptl/ChangeLog +++ b/nptl/ChangeLog @@ -1,3 +1,7 @@ +2010-07-01 Ulrich Drepper <drepper@redhat.com> + + * Makefile (tst-_res1): Add tst-_res1mod1 to dependency list. + 2010-10-13 H.J. Lu <hongjiu.lu@intel.com> [BZ #12113] diff --git a/nptl/Makefile b/nptl/Makefile index 982db8e205..3dcc876b2b 100644 --- a/nptl/Makefile +++ b/nptl/Makefile @@ -491,7 +491,8 @@ $(objpfx)tst-rwlock14: $(common-objpfx)rt/librt.so $(objpfx)tst-_res1mod2.so: $(objpfx)tst-_res1mod1.so LDFLAGS-tst-_res1mod1.so = -Wl,-soname,tst-_res1mod1.so LDFLAGS-tst-_res1mod2.so = -Wl,-soname,tst-_res1mod2.so -$(objpfx)tst-_res1: $(objpfx)tst-_res1mod2.so $(shared-thread-library) +$(objpfx)tst-_res1: $(objpfx)tst-_res1mod1.so $(objpfx)tst-_res1mod2.so \ + $(shared-thread-library) else $(objpfx)tst-cond11: $(common-objpfx)rt/librt.a $(objpfx)tst-cond19: $(common-objpfx)rt/librt.a |