mirrors/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-20 10:12:15 +01:00
Code Issues Projects Releases Wiki Activity

Stop setting $CARGO_HOME

Browse Source 
cargo will use the user's $CARGO_HOME, or $HOME/.cargo by default.

Fixes bug 26497; bugfix on 0.3.1.5-alpha.
This commit is contained in:
teor 2018-08-10 11:00:46 +10:00
parent 2a35b085ee
commit ce19477ffc
No known key found for this signature in database
GPG Key ID: 10FEAA0E7075672A
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
changes/bug26497 Normal file
View File

@ -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.

1
src/rust/tor_util/include.am
View File

@ -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:

1
src/test/test_rust.sh
View File

@ -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