commit 1969d573637ee6f9c539733db8405c72f0e2e4ab Author: Nick Mathewson <nickm@torproject.org> Date: Tue Dec 5 08:30:26 2017 -0500 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. --- changes/cargo-build-problem | 3 +++ src/rust/tor_rust/include.am | 12 ++++++++---- src/test/test_rust.sh | 8 ++++++-- 3 files changed, 17 insertions(+), 6 deletions(-) diff --git a/changes/cargo-build-problem b/changes/cargo-build-problem new file mode 100644 index 000000000..6691b0efc --- /dev/null +++ b/changes/cargo-build-problem @@ -0,0 +1,3 @@ + o Minor bugfixes (compilation, rust): + - Build correctly when building from outside Tor's source tree with the + TOR_RUST_DEPENDENCIES option set. Fixes bug 22768; bugfix on 0.3.1.7. diff --git a/src/rust/tor_rust/include.am b/src/rust/tor_rust/include.am index 79361c33c..c02324cb7 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 diff --git a/src/test/test_rust.sh b/src/test/test_rust.sh index 8d7900e1d..133f2bb94 100755 --- a/src/test/test_rust.sh +++ b/src/test/test_rust.sh @@ -8,8 +8,12 @@ exitcode=0 set -e for crate in $crates; do - cd "${abs_top_srcdir:-.}/src/rust/${crate}" - CARGO_TARGET_DIR="${abs_top_builddir:-../../..}/src/rust/target" CARGO_HOME="${abs_top_builddir:-../../..}/src/rust" "${CARGO:-cargo}" test ${CARGO_ONLINE-"--frozen"} || exitcode=1 + cd "${abs_top_builddir:-../../..}/src/rust" + CARGO_TARGET_DIR="${abs_top_builddir:-../../..}/src/rust/target" \ + CARGO_HOME="${abs_top_builddir:-../../..}/src/rust" \ + "${CARGO:-cargo}" test ${CARGO_ONLINE-"--frozen"} \ + --manifest-path "${abs_top_srcdir:-.}/src/rust/${crate}/Cargo.toml" \ + || exitcode=1 cd - done