diff options
| author | Chelsea H. Komlo <chelsea.komlo@gmail.com> | 2017-07-09 22:33:34 -0400 |
|---|---|---|
| committer | Isis Lovecruft <isis@torproject.org> | 2017-07-13 18:12:35 +0000 |
| commit | eb355e031e86a229b8d8375a5112f8484198373b (patch) | |
| tree | bb8ca0fcf949c88ff03718dbc588f619d49f4d88 /src | |
| parent | 1ff98a7e891b7af4e2f4313c360f3cb320e632a7 (diff) | |
| download | tor-eb355e031e86a229b8d8375a5112f8484198373b.tar.gz tor-eb355e031e86a229b8d8375a5112f8484198373b.zip | |
use CARGO_HOME instead of HOME when building with rust
Diffstat (limited to 'src')
| -rw-r--r-- | src/rust/tor_util/include.am | 2 | ||||
| -rwxr-xr-x | src/test/test_rust.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/rust/tor_util/include.am b/src/rust/tor_util/include.am index 17a755fe09..f0cd63920c 100644 --- a/src/rust/tor_util/include.am +++ b/src/rust/tor_util/include.am @@ -7,7 +7,7 @@ EXTRA_DIST +=\ src/rust/target/release/libtor_util.a: FORCE ( cd "$(abs_top_srcdir)/src/rust/tor_util" ; \ CARGO_TARGET_DIR="$(abs_top_builddir)/src/rust/target" \ - HOME="$(abs_top_builddir)/src/rust" \ + 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 4427c70f13..d559f94ce0 100755 --- a/src/test/test_rust.sh +++ b/src/test/test_rust.sh @@ -7,7 +7,7 @@ exitcode=0 for crate in $crates; do cd "${abs_top_srcdir:-.}/src/rust/${crate}" - CARGO_TARGET_DIR="${abs_top_builddir}/src/rust/target" HOME="${abs_top_builddir}/src/rust" "${CARGO:-cargo}" test ${CARGO_ONLINE-"--frozen"} || exitcode=1 + CARGO_TARGET_DIR="${abs_top_builddir}/src/rust/target" CARGO_HOME="${abs_top_builddir}/src/rust" "${CARGO:-cargo}" test ${CARGO_ONLINE-"--frozen"} || exitcode=1 done exit $exitcode |