From: Tom Hughes <tom@compton.nu>
Date: Thu, 29 Apr 2010 09:22:25 +0000 (+0000)
Subject: Link the tls test against tls2.so as it references symbols in it
X-Git-Tag: svn/VALGRIND_3_6_0~310
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8e3cd040cb748df08786c2187a0f3d9827b2debf;p=thirdparty%2Fvalgrind.git

Link the tls test against tls2.so as it references symbols in it
and Fedora 13 no longer allows so's to be required indirectly (via
tls.so in this case).


git-svn-id: svn://svn.valgrind.org/valgrind/trunk@11114
---

diff --git a/none/tests/Makefile.am b/none/tests/Makefile.am
index 730d3a29bd..ff28e2a1fa 100644
--- a/none/tests/Makefile.am
+++ b/none/tests/Makefile.am
@@ -237,13 +237,13 @@ thread_exits_LDADD	= -lpthread
 threaded_fork_LDADD	= -lpthread
 threadederrno_LDADD	= -lpthread
 tls_SOURCES		= tls.c tls2.c
-tls_DEPENDENCIES	= tls.so
+tls_DEPENDENCIES	= tls.so tls2.so
 if VGCONF_OS_IS_AIX5
  tls_LDFLAGS		= 
 else
  tls_LDFLAGS		= -Wl,-rpath,$(top_builddir)/none/tests
 endif
-tls_LDADD		= tls.so -lpthread
+tls_LDADD		= tls.so tls2.so -lpthread
 tls_so_SOURCES		= tls_so.c
 tls_so_DEPENDENCIES	= tls2.so
 if VGCONF_OS_IS_AIX5