diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-12-05 08:30:26 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-12-05 14:23:55 -0500 |
| commit | 1969d573637ee6f9c539733db8405c72f0e2e4ab (patch) | |
| tree | e5f39bebbf2ffaebbca3873babfb088528601280 /src/rust/tor_rust/include.am | |
| parent | a798ba6e9bd5ef7fed89948ffa0e7334ceb1844e (diff) | |
| download | tor-1969d573637ee6f9c539733db8405c72f0e2e4ab.tar.gz tor-1969d573637ee6f9c539733db8405c72f0e2e4ab.zip | |
Change our build process to run Cargo from inside the build tree
Instead of using the cwd to specify the location of Cargo.toml, we
use the --manifest-path option to specify its location explicitly.
This works around the bug that isis diagnosed on our jenkins builds.
Diffstat (limited to 'src/rust/tor_rust/include.am')
| -rw-r--r-- | src/rust/tor_rust/include.am | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/rust/tor_rust/include.am b/src/rust/tor_rust/include.am index 79361c33cc..c02324cb77 100644 --- a/src/rust/tor_rust/include.am +++ b/src/rust/tor_rust/include.am @@ -5,16 +5,20 @@ EXTRA_DIST +=\ EXTRA_CARGO_OPTIONS= src/rust/target/release/@TOR_RUST_STATIC_NAME@: FORCE - ( cd "$(abs_top_srcdir)/src/rust/tor_rust" ; \ + ( cd "$(abs_top_builddir)/src/rust" ; \ CARGO_TARGET_DIR="$(abs_top_builddir)/src/rust/target" \ CARGO_HOME="$(abs_top_builddir)/src/rust" \ - $(CARGO) build --release $(EXTRA_CARGO_OPTIONS) $(CARGO_ONLINE) ) + $(CARGO) build --release $(EXTRA_CARGO_OPTIONS) \ + $(CARGO_ONLINE) \ + --manifest-path "$(abs_top_srcdir)/src/rust/tor_rust/Cargo.toml" ) distclean-rust: - ( cd "$(abs_top_srcdir)/src/rust/tor_rust" ; \ + ( cd "$(abs_top_builddir)/src/rust" ; \ CARGO_TARGET_DIR="$(abs_top_builddir)/src/rust/target" \ CARGO_HOME="$(abs_top_builddir)/src/rust" \ - $(CARGO) clean $(EXTRA_CARGO_OPTIONS) $(CARGO_ONLINE) ) + $(CARGO) clean $(EXTRA_CARGO_OPTIONS) \ + $(CARGO_ONLINE) \ + --manifest-path "$(abs_top_srcdir)/src/rust/tor_rust/Cargo.toml" ) rm -rf "$(abs_top_builddir)/src/rust/registry" if USE_RUST |