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 | |
| parent | 01adeb2471360f4c832252d8b9b9a05ab212a76c (diff) | |
| parent | 0cb89eb828005ccf4b1ae72988b9c3b958ceade4 (diff) | |
| download | tor-f470756cf4660bd7d5e9d4c8d66a56adfd3b7ff7.tar.gz tor-f470756cf4660bd7d5e9d4c8d66a56adfd3b7ff7.zip | |
Merge branch 'maint-0.3.2'
| -rw-r--r-- | Makefile.am | 3 | ||||
| -rw-r--r-- | changes/bug24652 | 6 | ||||
| -rw-r--r-- | configure.ac | 11 |
3 files changed, 19 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 diff --git a/changes/bug24652 b/changes/bug24652 new file mode 100644 index 0000000000..6e35e259e9 --- /dev/null +++ b/changes/bug24652 @@ -0,0 +1,6 @@ + o Minor bugfixes (build, compatibility, rust, OSX): + + - When building with Rust on OSX, link against libresolv, to + work around the issue at + https://github.com/rust-lang/rust/issues/46797. Fixes bug + 24652; bugfix on 0.3.1.1-alpha. diff --git a/configure.ac b/configure.ac index e471f8f914..9bb09b2dfa 100644 --- a/configure.ac +++ b/configure.ac @@ -456,6 +456,15 @@ 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 @@ -482,6 +491,8 @@ 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]) |