tor

commit e6d2059751da008a1fb00b42039eb4cbc638e638
parent 5636b160d42e344f936f881992c19b3c27f60a2c
Author: Nick Mathewson <nickm@torproject.org>
Date:   Thu, 13 Jul 2017 16:51:09 -0400

Merge remote-tracking branch 'isis/bug22830_0.3.1' into maint-0.3.1

Diffstat:
A
changes/bug22830
 | 
5
+++++
M
src/rust/tor_util/include.am
 | 
2
+-
M
src/test/test_rust.sh
 | 
2
+-

3 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/changes/bug22830 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
@@ -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
@@ -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