[tor-commits] [tor/master] Merge remote-tracking branch 'isis/bug25341' into ticket25341_merged_v2

[nickm at torproject.org]

commit a4f2075170b4ba58becee26031d5192d42a96040
Merge: a8df39e95 af3e5bed1
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Nov 19 09:22:30 2018 -0500

    Merge remote-tracking branch 'isis/bug25341' into ticket25341_merged_v2

 Makefile.am  |  4 +---
 configure.ac | 11 -----------
 2 files changed, 1 insertion(+), 14 deletions(-)

diff --cc Makefile.am
index cb76edfa2,2c6de3574..803e9d00d
--- a/Makefile.am
+++ b/Makefile.am
@@@ -31,9 -26,7 +31,7 @@@ TESTING_TOR_BINARY=$(top_builddir)/src/
  endif
  
  if USE_RUST
- ## this MUST be $(), otherwise am__DEPENDENCIES will not track it
- rust_ldadd=$(top_builddir)/$(TOR_RUST_LIB_PATH) \
- 	$(TOR_RUST_EXTRA_LIBS)
 -rust_ldadd=$(top_builddir)/src/rust/target/release/@TOR_RUST_STATIC_NAME@
++rust_ldadd=$(top_builddir)/$(TOR_RUST_LIB_PATH)
  else
  rust_ldadd=
  endif