diff options
| author | Ties Stuij <ties@stuij.se> | 2017-08-10 01:08:41 -0700 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-08-21 15:08:24 -0400 |
| commit | 2e99f839e97e2b5b1e99abdb9a8673380c87ae18 (patch) | |
| tree | 41cce07bc13c706c4e94d0332b82fb702cef24f5 /src/tools | |
| parent | 8f8a061b0c4724adebb4af1d5ac3edb7381269d5 (diff) | |
| download | tor-2e99f839e97e2b5b1e99abdb9a8673380c87ae18.tar.gz tor-2e99f839e97e2b5b1e99abdb9a8673380c87ae18.zip | |
22839: Build tor with rust enabled on win
- make tor_util static library name configurable
- fix Rust libary dependency order for Windows
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/include.am | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/tools/include.am b/src/tools/include.am index 717af9e2ae..37936c742f 100644 --- a/src/tools/include.am +++ b/src/tools/include.am @@ -8,8 +8,8 @@ src_tools_tor_resolve_SOURCES = src/tools/tor-resolve.c src_tools_tor_resolve_LDFLAGS = src_tools_tor_resolve_LDADD = src/common/libor.a \ src/common/libor-ctime.a \ - @TOR_LIB_MATH@ @TOR_LIB_WS32@ \ - $(rust_ldadd) + $(rust_ldadd) \ + @TOR_LIB_MATH@ @TOR_LIB_WS32@ @TOR_LIB_USERENV@ if COVERAGE_ENABLED src_tools_tor_cov_resolve_SOURCES = src/tools/tor-resolve.c @@ -26,9 +26,9 @@ src_tools_tor_gencert_LDADD = src/common/libor.a src/common/libor-crypto.a \ src/common/libor-ctime.a \ $(LIBKECCAK_TINY) \ $(LIBDONNA) \ + $(rust_ldadd) \ @TOR_LIB_MATH@ @TOR_ZLIB_LIBS@ @TOR_OPENSSL_LIBS@ \ - @TOR_LIB_WS32@ @TOR_LIB_GDI@ @CURVE25519_LIBS@ \ - $(rust_ldadd) + @TOR_LIB_WS32@ @TOR_LIB_GDI@ @TOR_LIB_USERENV@ @CURVE25519_LIBS@ if COVERAGE_ENABLED src_tools_tor_cov_gencert_SOURCES = src/tools/tor-gencert.c |