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
commitaa79196ee05e4ee8169de2156478e7cfba49ef0e (patch)
tree6119b6c4bebbd891ec4e2d401dd90ace1b5c3f8f
parent59c3910becd912a18ee8e7a74c966045e7a51c80 (diff)
parent34183f0d71c2e2d10e3d64291e3bb83a27c2416a (diff)
downloadtor-aa79196ee05e4ee8169de2156478e7cfba49ef0e.tar.gz
tor-aa79196ee05e4ee8169de2156478e7cfba49ef0e.zip
Merge branch 'maint-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)