diff options
| author | teor <teor@torproject.org> | 2018-08-10 11:00:46 +1000 |
|---|---|---|
| committer | teor <teor@torproject.org> | 2018-08-10 11:14:32 +1000 |
| commit | ce19477ffcdf64255f050308182f3d682e6f6de1 (patch) | |
| tree | 72e9fd7a3d256c27e76a6a4a4d74c3a34a180c30 /src | |
| parent | 2a35b085eeee977376b5c5e2dd084f9f505d8f8a (diff) | |
| download | tor-ce19477ffcdf64255f050308182f3d682e6f6de1.tar.gz tor-ce19477ffcdf64255f050308182f3d682e6f6de1.zip | |
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.
Diffstat (limited to 'src')
| -rw-r--r-- | src/rust/tor_util/include.am | 1 | ||||
| -rwxr-xr-x | src/test/test_rust.sh | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/src/rust/tor_util/include.am b/src/rust/tor_util/include.am index ec3898577b..c110602895 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 4ecca7834d..9ad7a698ad 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 |