summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2019-02-21 09:10:34 -0500
committerNick Mathewson <nickm@torproject.org>2019-02-21 09:10:34 -0500
commitd97548a6fa09d418b93a70b5763e7b9ebe692fb6 (patch)
tree2dbe798804493d7e77f8548224dec3ebe059527e
parentba8c3735f01e5568d98e9918bcaa801c215c650c (diff)
parent34183f0d71c2e2d10e3d64291e3bb83a27c2416a (diff)
downloadtor-d97548a6fa09d418b93a70b5763e7b9ebe692fb6.tar.gz
tor-d97548a6fa09d418b93a70b5763e7b9ebe692fb6.zip
Merge branch 'maint-0.4.0' into release-0.4.0
-rw-r--r--src/test/include.am2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/test/include.am b/src/test/include.am
index 9bfc626b28..d585c2a38a 100644
--- a/src/test/include.am
+++ b/src/test/include.am
@@ -259,7 +259,7 @@ src_test_test_LDADD = \
src_test_test_slow_CPPFLAGS = $(src_test_test_CPPFLAGS)
src_test_test_slow_CFLAGS = $(src_test_test_CFLAGS)
src_test_test_slow_LDADD = $(src_test_test_LDADD)
-src_test_test_slow_LDFLAGS = @TOR_LDFLAGS_openssl@ @TOR_LDFLAGS_libevent@
+src_test_test_slow_LDFLAGS = $(src_test_test_LDFLAGS)
src_test_test_rng_CPPFLAGS = $(src_test_test_CPPFLAGS)
src_test_test_rng_CFLAGS = $(src_test_test_CFLAGS)