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/rust/tor_util | |
| 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/rust/tor_util')
| -rw-r--r-- | src/rust/tor_util/include.am | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/rust/tor_util/include.am b/src/rust/tor_util/include.am index f0cd63920c..ec3898577b 100644 --- a/src/rust/tor_util/include.am +++ b/src/rust/tor_util/include.am @@ -4,7 +4,7 @@ EXTRA_DIST +=\ src/rust/tor_util/ffi.rs \ src/rust/tor_util/rust_string.rs -src/rust/target/release/libtor_util.a: FORCE +src/rust/target/release/@TOR_RUST_UTIL_STATIC_NAME@: FORCE ( cd "$(abs_top_srcdir)/src/rust/tor_util" ; \ CARGO_TARGET_DIR="$(abs_top_builddir)/src/rust/target" \ CARGO_HOME="$(abs_top_builddir)/src/rust" \ |