summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorUlrich Drepper <[email protected]>2009-04-23 07:59:02 -0700
committerUlrich Drepper <[email protected]>2009-04-23 07:59:02 -0700
commitf9545c4ac7ec2cf0d5b69aa2db043f9f4df6c6c5 (patch)
tree0a56dda4f6afbebc0536b67577e4127c13195822
parent4f5157128605162859bbf49f29abc20fee839cf5 (diff)
Fix building tests with mudflap.
-rw-r--r--tests/ChangeLog5
-rw-r--r--tests/Makefile.am6
2 files changed, 8 insertions, 3 deletions
diff --git a/tests/ChangeLog b/tests/ChangeLog
index 70e9c027..f1fd512b 100644
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,3 +1,8 @@
+2009-04-23 Ulrich Drepper <[email protected]>
+
+ * Makefile [BUILD_STATIC] (libdw): Add $(zip_LIBS).
+ (rdwrmmap_LDADD): Add $(libmudflap).
+
2009-04-21 Roland McGrath <[email protected]>
* testfile50.bz2: New data file.
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 81c1ab76..9f4ccddb 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -160,7 +160,7 @@ installcheck-local:
endif !STANDALONE
if MUDFLAP
-static_build=yes
+static_build = yes
libmudflap = -lmudflap
endif
@@ -171,7 +171,7 @@ libasm = -lasm
libebl = -lebl
else !STANDALONE
if BUILD_STATIC
-libdw = ../libdw/libdw.a $(libelf) $(libebl) -ldl
+libdw = ../libdw/libdw.a $(zip_LIBS) $(libelf) $(libebl) -ldl
libelf = ../libelf/libelf.a
libasm = ../libasm/libasm.a
else
@@ -225,7 +225,7 @@ asm_tst7_LDADD = $(libasm) $(libebl) $(libelf) $(libmudflap) -ldl
asm_tst8_LDADD = $(libasm) $(libebl) $(libelf) $(libmudflap) -ldl
asm_tst9_LDADD = $(libasm) $(libebl) $(libelf) $(libmudflap) -ldl
dwflmodtest_LDADD = $(libdw) $(libebl) $(libelf) $(libmudflap) -ldl
-rdwrmmap_LDADD = $(libelf)
+rdwrmmap_LDADD = $(libelf) $(libmudflap)
dwfl_bug_addr_overflow_LDADD = $(libdw) $(libebl) $(libelf) $(libmudflap) -ldl
arls_LDADD = $(libelf) $(libmudflap)
dwfl_bug_fd_leak_LDADD = $(libdw) $(libebl) $(libelf) $(libmudflap) -ldl