diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-01-16 13:35:52 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-01-16 13:35:52 -0500 |
| commit | 0cb89eb828005ccf4b1ae72988b9c3b958ceade4 (patch) | |
| tree | 54d87b5efa6dd8903b996699385aa2d4fb236b5e /Makefile.am | |
| parent | db5aa54a422cd45b690293a0c618e6275e1c3608 (diff) | |
| parent | 2ac9734bd21f3eecb20560cde5c4037230029157 (diff) | |
| download | tor-0cb89eb828005ccf4b1ae72988b9c3b958ceade4.tar.gz tor-0cb89eb828005ccf4b1ae72988b9c3b958ceade4.zip | |
Merge remote-tracking branch 'public/bug24652_032' into maint-0.3.2
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am index ad2ceb66a9..a126986f3a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -26,7 +26,8 @@ TESTING_TOR_BINARY=$(top_builddir)/src/or/tor$(EXEEXT) endif if USE_RUST -rust_ldadd=$(top_builddir)/src/rust/target/release/@TOR_RUST_UTIL_STATIC_NAME@ +rust_ldadd=$(top_builddir)/src/rust/target/release/@TOR_RUST_UTIL_STATIC_NAME@ \ + @TOR_RUST_EXTRA_LIBS@ else rust_ldadd= endif |