From 6b95c945ddb7262778d1bccc376e119aaa91a140 Mon Sep 17 00:00:00 2001
From: Nick Mathewson <nickm@freehaven.net>
Date: Sun, 1 Jul 2018 10:17:50 -0400
Subject: [PATCH] When building Tor, get an up-to-date list of the static
 libraries (#1585)

---
 projects/tor/build.sh | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/projects/tor/build.sh b/projects/tor/build.sh
index 348196071..fcfaac871 100644
--- a/projects/tor/build.sh
+++ b/projects/tor/build.sh
@@ -68,16 +68,7 @@ export ASAN_OPTIONS=detect_leaks=0
 make clean
 make -j$(nproc) oss-fuzz-fuzzers
 
-TORLIBS="src/or/libtor-testing.a"
-TORLIBS="$TORLIBS src/common/libor-crypto-testing.a"
-TORLIBS="$TORLIBS src/ext/keccak-tiny/libkeccak-tiny.a"
-TORLIBS="$TORLIBS src/common/libcurve25519_donna.a"
-TORLIBS="$TORLIBS src/ext/ed25519/ref10/libed25519_ref10.a"
-TORLIBS="$TORLIBS src/ext/ed25519/donna/libed25519_donna.a"
-TORLIBS="$TORLIBS src/common/libor-testing.a"
-TORLIBS="$TORLIBS src/common/libor-ctime-testing.a"
-TORLIBS="$TORLIBS src/common/libor-event-testing.a"
-TORLIBS="$TORLIBS src/trunnel/libor-trunnel-testing.a"
+TORLIBS="`make show-testing-libs`"
 TORLIBS="$TORLIBS -lm -Wl,-Bstatic -lssl -lcrypto -levent -lz -L${TOR_DEPS}/lib"
 TORLIBS="$TORLIBS -Wl,-Bdynamic"