diff options
| author | teor <teor@torproject.org> | 2018-08-10 11:47:36 +1000 |
|---|---|---|
| committer | teor <teor@torproject.org> | 2018-08-10 11:47:36 +1000 |
| commit | 0f3fd10ee0f609cae6d2fe87fa437026f5e9e003 (patch) | |
| tree | 2b01017c2780b430c963206edb45fd8bd6e8448f | |
| parent | 2b9dd0f9c0247d1723d1508b03d7a0ec0790eb27 (diff) | |
| download | tor-0f3fd10ee0f609cae6d2fe87fa437026f5e9e003.tar.gz tor-0f3fd10ee0f609cae6d2fe87fa437026f5e9e003.zip | |
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.
| -rw-r--r-- | src/rust/tor_rust/include.am | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/rust/tor_rust/include.am b/src/rust/tor_rust/include.am index c02324cb77..40511bf9f2 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" ) |