diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-07-13 16:51:09 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-07-13 16:51:09 -0400 |
| commit | e6d2059751da008a1fb00b42039eb4cbc638e638 (patch) | |
| tree | bc4cee712cbf00fcccacb6f559c9fb72391a1861 | |
| parent | 5636b160d42e344f936f881992c19b3c27f60a2c (diff) | |
| parent | 8de1b94b9db9156e1d8cdce9fab8a911cdb1ee43 (diff) | |
| download | tor-e6d2059751da008a1fb00b42039eb4cbc638e638.tar.gz tor-e6d2059751da008a1fb00b42039eb4cbc638e638.zip | |
Merge remote-tracking branch 'isis/bug22830_0.3.1' into maint-0.3.1
| -rw-r--r-- | changes/bug22830 | 5 | ||||
| -rw-r--r-- | src/rust/tor_util/include.am | 2 | ||||
| -rwxr-xr-x | src/test/test_rust.sh | 2 |
3 files changed, 7 insertions, 2 deletions
diff --git a/changes/bug22830 b/changes/bug22830 new file mode 100644 index 0000000000..123b725aff --- /dev/null +++ b/changes/bug22830 @@ -0,0 +1,5 @@ + o Minor bugfixes: + - Fix a problem with Rust toolchains not being found when building + without --enable-cargo-online-mode, due to setting the $HOME + environment variable instead of $CARGO_HOME. Fixes bug 22830; + fix by Chelsea Komlo. Bugfix on 0.3.1.1-alpha. diff --git a/src/rust/tor_util/include.am b/src/rust/tor_util/include.am index 17a755fe09..f0cd63920c 100644 --- a/src/rust/tor_util/include.am +++ b/src/rust/tor_util/include.am @@ -7,7 +7,7 @@ EXTRA_DIST +=\ src/rust/target/release/libtor_util.a: FORCE ( cd "$(abs_top_srcdir)/src/rust/tor_util" ; \ CARGO_TARGET_DIR="$(abs_top_builddir)/src/rust/target" \ - HOME="$(abs_top_builddir)/src/rust" \ + CARGO_HOME="$(abs_top_builddir)/src/rust" \ $(CARGO) build --release --quiet $(CARGO_ONLINE) ) FORCE: diff --git a/src/test/test_rust.sh b/src/test/test_rust.sh index 4427c70f13..d559f94ce0 100755 --- a/src/test/test_rust.sh +++ b/src/test/test_rust.sh @@ -7,7 +7,7 @@ exitcode=0 for crate in $crates; do cd "${abs_top_srcdir:-.}/src/rust/${crate}" - CARGO_TARGET_DIR="${abs_top_builddir}/src/rust/target" HOME="${abs_top_builddir}/src/rust" "${CARGO:-cargo}" test ${CARGO_ONLINE-"--frozen"} || exitcode=1 + CARGO_TARGET_DIR="${abs_top_builddir}/src/rust/target" CARGO_HOME="${abs_top_builddir}/src/rust" "${CARGO:-cargo}" test ${CARGO_ONLINE-"--frozen"} || exitcode=1 done exit $exitcode |