From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 19 Nov 2018 14:22:30 +0000 (-0500)
Subject: Merge remote-tracking branch 'isis/bug25341' into ticket25341_merged_v2
X-Git-Tag: tor-0.4.0.1-alpha~123^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a4f2075170b4ba58becee26031d5192d42a96040;p=thirdparty%2Ftor.git

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

a4f2075170b4ba58becee26031d5192d42a96040
diff --cc Makefile.am
index cb76edfa2f,2c6de35743..803e9d00df
--- 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