diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2010-07-01 19:03:29 -0700 |
|---|---|---|
| committer | Petr Baudis <pasky@suse.cz> | 2010-11-09 01:38:11 +0100 |
| commit | a17f00a81580154f1c0cd6cc9799c9584c0965e2 (patch) | |
| tree | 9f10b88aaf0aed820ff5d0aec2f77c9d03446174 | |
| parent | 9ca2c3cc19959d0f37389e1bcb0b67bf93cb9768 (diff) | |
| download | glibc-a17f00a81580154f1c0cd6cc9799c9584c0965e2.tar.gz | |
Fix build with newer linker.
(cherry picked from commit 72b6e8c85b95a949d8c5d827a16dd1492d9ef26b)
| -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 bb2e5dc684..82ebdbe761 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 f96ed458e6..df458ac585 100644 --- a/nptl/Makefile +++ b/nptl/Makefile @@ -489,7 +489,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 |