diff options
author | Nick Mathewson <nickm@torproject.org> | 2018-01-16 13:36:48 -0500 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2018-01-16 13:36:48 -0500 |
commit | f470756cf4660bd7d5e9d4c8d66a56adfd3b7ff7 (patch) | |
tree | b514a0472cbaf3b926de973f034b015ff3a66898 /Makefile.am | |
parent | 01adeb2471360f4c832252d8b9b9a05ab212a76c (diff) | |
parent | 0cb89eb828005ccf4b1ae72988b9c3b958ceade4 (diff) | |
download | tor-f470756cf4660bd7d5e9d4c8d66a56adfd3b7ff7.tar.gz tor-f470756cf4660bd7d5e9d4c8d66a56adfd3b7ff7.zip |
Merge branch '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 2c6de35743..04ca88a236 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_STATIC_NAME@ +rust_ldadd=$(top_builddir)/src/rust/target/release/@TOR_RUST_STATIC_NAME@ \ + @TOR_RUST_EXTRA_LIBS@ else rust_ldadd= endif |