[tor-commits] [tor/master] Merge branch 'maint-0.3.2'

nickm at torproject.org nickm at torproject.org
Tue Jan 16 18:36:56 UTC 2018


commit f470756cf4660bd7d5e9d4c8d66a56adfd3b7ff7
Merge: 01adeb247 0cb89eb82
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Jan 16 13:36:48 2018 -0500

    Merge branch 'maint-0.3.2'

 Makefile.am      |  3 ++-
 changes/bug24652 |  6 ++++++
 configure.ac     | 11 +++++++++++
 3 files changed, 19 insertions(+), 1 deletion(-)

diff --cc Makefile.am
index 2c6de3574,a126986f3..04ca88a23
--- a/Makefile.am
+++ b/Makefile.am
@@@ -26,7 -26,8 +26,8 @@@ TESTING_TOR_BINARY=$(top_builddir)/src/
  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_UTIL_STATIC_NAME@ \
++rust_ldadd=$(top_builddir)/src/rust/target/release/@TOR_RUST_STATIC_NAME@ \
+ 	@TOR_RUST_EXTRA_LIBS@
  else
  rust_ldadd=
  endif
diff --cc configure.ac
index e471f8f91,0fdb84c13..9bb09b2df
--- a/configure.ac
+++ b/configure.ac
@@@ -479,9 -467,10 +488,11 @@@ if test "x$enable_rust" = "xyes"; the
    if test "$RUSTC_VERSION_MAJOR" -lt 2 -a "$RUSTC_VERSION_MINOR" -lt 14; then
      AC_MSG_ERROR([rustc must be at least version 1.14])
    fi
 +  AC_MSG_RESULT([$RUSTC_VERSION])
  fi
  
+ AC_SUBST(TOR_RUST_EXTRA_LIBS)
+ 
  AC_SEARCH_LIBS(socket, [socket network])
  AC_SEARCH_LIBS(gethostbyname, [nsl])
  AC_SEARCH_LIBS(dlopen, [dl])



More information about the tor-commits mailing list