diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-11-20 13:14:56 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-11-20 13:14:56 -0500 |
| commit | b406fdae4fff9a6495a9ad319e7f2b565de52ac8 (patch) | |
| tree | 40671f84830abf4d09e59aa591f9fdcb097b6548 | |
| parent | 56f24889a2ce1cb6256e35b788eb2942d720cbde (diff) | |
| parent | a4f2075170b4ba58becee26031d5192d42a96040 (diff) | |
| download | tor-b406fdae4fff9a6495a9ad319e7f2b565de52ac8.tar.gz tor-b406fdae4fff9a6495a9ad319e7f2b565de52ac8.zip | |
Merge branch 'ticket25341_merged_v2'
| -rw-r--r-- | Makefile.am | 4 | ||||
| -rw-r--r-- | configure.ac | 11 |
2 files changed, 1 insertions, 14 deletions
diff --git a/Makefile.am b/Makefile.am index cb76edfa2f..803e9d00df 100644 --- a/Makefile.am +++ b/Makefile.am @@ -31,9 +31,7 @@ TESTING_TOR_BINARY=$(top_builddir)/src/app/tor$(EXEEXT) 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)/$(TOR_RUST_LIB_PATH) else rust_ldadd= endif diff --git a/configure.ac b/configure.ac index 01fd9f82ae..31e41c3bbc 100644 --- a/configure.ac +++ b/configure.ac @@ -503,15 +503,6 @@ if test "x$enable_rust" = "xyes"; then fi fi - dnl This is a workaround for #46797 - dnl (a.k.a https://github.com/rust-lang/rust/issues/46797 ). Once the - dnl upstream bug is fixed, we can remove this workaround. - case "$host_os" in - darwin*) - TOR_RUST_EXTRA_LIBS="-lresolv" - ;; - esac - dnl For now both MSVC and MinGW rust libraries will output static libs with dnl the MSVC naming convention. if test "$bwin32" = "true"; then @@ -556,8 +547,6 @@ if test "x$enable_rust" = "xyes"; then 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]) |