diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-06-30 09:15:34 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-06-30 09:15:34 -0400 |
| commit | e042727cf02fbeb0dd193f5faa60f7caf1f19aea (patch) | |
| tree | 81c44d0221542492e688d21c44fe892eb0fe34a6 /src/rust | |
| parent | 3808e3015a75def1cfa7554aae4c6b06d9498d73 (diff) | |
| parent | 614a78ddaa8e28919cab79156b43cb16e5fb9f04 (diff) | |
| download | tor-e042727cf02fbeb0dd193f5faa60f7caf1f19aea.tar.gz tor-e042727cf02fbeb0dd193f5faa60f7caf1f19aea.zip | |
Merge remote-tracking branch 'catalyst-github/bug25895_034-squashed' into maint-0.3.4
Diffstat (limited to 'src/rust')
| -rw-r--r-- | src/rust/.cargo/config.in | 5 | ||||
| -rw-r--r-- | src/rust/tor_rust/include.am | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/src/rust/.cargo/config.in b/src/rust/.cargo/config.in index 70481bbcbe..6eddc75459 100644 --- a/src/rust/.cargo/config.in +++ b/src/rust/.cargo/config.in @@ -7,5 +7,6 @@ @RUST_DL@ [source.vendored-sources] @RUST_DL@ directory = '@TOR_RUST_DEPENDENCIES@' -@RUST_WARN@ [build] -@RUST_WARN@ rustflags = [ "-D", "warnings" ]
\ No newline at end of file +[build] +@RUST_WARN@ rustflags = [ "-D", "warnings" ] +@RUST_TARGET_PROP@ diff --git a/src/rust/tor_rust/include.am b/src/rust/tor_rust/include.am index c02324cb77..bcf94193f4 100644 --- a/src/rust/tor_rust/include.am +++ b/src/rust/tor_rust/include.am @@ -4,7 +4,7 @@ EXTRA_DIST +=\ EXTRA_CARGO_OPTIONS= -src/rust/target/release/@TOR_RUST_STATIC_NAME@: FORCE +@TOR_RUST_LIB_PATH@: FORCE ( cd "$(abs_top_builddir)/src/rust" ; \ CARGO_TARGET_DIR="$(abs_top_builddir)/src/rust/target" \ CARGO_HOME="$(abs_top_builddir)/src/rust" \ @@ -22,7 +22,7 @@ distclean-rust: rm -rf "$(abs_top_builddir)/src/rust/registry" if USE_RUST -build-rust: src/rust/target/release/@TOR_RUST_STATIC_NAME@ +build-rust: @TOR_RUST_LIB_PATH@ else build-rust: endif |