[tor-commits] [tor/maint-0.3.4] Stop setting $CARGO_HOME in src/rust/tor_rust/include.am

[nickm@xxxxxxxxxxxxxx]

commit 0f3fd10ee0f609cae6d2fe87fa437026f5e9e003
Author: teor <teor@xxxxxxxxxxxxxx>
Date:   Fri Aug 10 11:47:36 2018 +1000

    Stop setting $CARGO_HOME in src/rust/tor_rust/include.am
    
    cargo will use the user's $CARGO_HOME, or $HOME/.cargo by default.
    
    Fixes bug 26497; bugfix on 0.3.1.5-alpha.
---
 src/rust/tor_rust/include.am | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/rust/tor_rust/include.am b/src/rust/tor_rust/include.am
index c02324cb7..40511bf9f 100644
--- a/src/rust/tor_rust/include.am
+++ b/src/rust/tor_rust/include.am
@@ -7,7 +7,6 @@ EXTRA_CARGO_OPTIONS=
 src/rust/target/release/@TOR_RUST_STATIC_NAME@: FORCE
 	( 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) \
                 --manifest-path "$(abs_top_srcdir)/src/rust/tor_rust/Cargo.toml" )
@@ -15,7 +14,6 @@ src/rust/target/release/@TOR_RUST_STATIC_NAME@: FORCE
 distclean-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) \
                 --manifest-path "$(abs_top_srcdir)/src/rust/tor_rust/Cargo.toml" )



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits