[tor-commits] [tor/maint-0.3.1] use CARGO_HOME instead of HOME when building with rust

nickm at torproject.org nickm at torproject.org
Thu Jul 13 20:51:27 UTC 2017


commit eb355e031e86a229b8d8375a5112f8484198373b
Author: Chelsea H. Komlo <chelsea.komlo at gmail.com>
Date:   Sun Jul 9 22:33:34 2017 -0400

    use CARGO_HOME instead of HOME when building with rust
---
 src/rust/tor_util/include.am | 2 +-
 src/test/test_rust.sh        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/rust/tor_util/include.am b/src/rust/tor_util/include.am
index 17a755f..f0cd639 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 4427c70..d559f94 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





More information about the tor-commits mailing list