[tor-commits] [tor/release-0.3.4] Stop setting $CARGO_HOME

[nickm at torproject.org]

commit ce19477ffcdf64255f050308182f3d682e6f6de1
Author: teor <teor at torproject.org>
Date:   Fri Aug 10 11:00:46 2018 +1000

    Stop setting $CARGO_HOME
    
    cargo will use the user's $CARGO_HOME, or $HOME/.cargo by default.
    
    Fixes bug 26497; bugfix on 0.3.1.5-alpha.
---
 changes/bug26497             | 3 +++
 src/rust/tor_util/include.am | 1 -
 src/test/test_rust.sh        | 1 -
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/changes/bug26497 b/changes/bug26497
new file mode 100644
index 000000000..d0c05ff3e
--- /dev/null
+++ b/changes/bug26497
@@ -0,0 +1,3 @@
+  o Minor bugfixes (rust):
+    - Stop setting $CARGO_HOME. cargo will use the user's $CARGO_HOME, or
+      $HOME/.cargo by default. Fixes bug 26497; bugfix on 0.3.1.5-alpha.
diff --git a/src/rust/tor_util/include.am b/src/rust/tor_util/include.am
index ec3898577..c11060289 100644
--- a/src/rust/tor_util/include.am
+++ b/src/rust/tor_util/include.am
@@ -7,7 +7,6 @@ EXTRA_DIST +=\
 src/rust/target/release/@TOR_RUST_UTIL_STATIC_NAME@: FORCE
 	( cd "$(abs_top_srcdir)/src/rust/tor_util" ; \
 		CARGO_TARGET_DIR="$(abs_top_builddir)/src/rust/target" \
-		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 4ecca7834..9ad7a698a 100755
--- a/src/test/test_rust.sh
+++ b/src/test/test_rust.sh
@@ -9,7 +9,6 @@ for cargo_toml_dir in "${abs_top_srcdir:-../../..}"/src/rust/*; do
     if [ -e "${cargo_toml_dir}/Cargo.toml" ]; then
 	cd "${cargo_toml_dir}" && \
 	    CARGO_TARGET_DIR="${abs_top_builddir:-../../..}/src/rust/target" \
-	    CARGO_HOME="${abs_top_builddir:-../../..}/src/rust/.cargo" \
 	    "${CARGO:-cargo}" test ${CARGO_ONLINE-"--frozen"} \
 	    ${EXTRA_CARGO_OPTIONS} \
 	    --manifest-path "${cargo_toml_dir}/Cargo.toml" || exitcode=1