nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-10 13:13:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'isis/bug22830_0.3.1' into maint-0.3.1

Browse Source
This commit is contained in:
Nick Mathewson 2017-07-13 16:51:09 -04:00
commit e6d2059751
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
changes/bug22830 Normal file
View File

@ -0,0 +1,5 @@
o Minor bugfixes:
- Fix a problem with Rust toolchains not being found when building
without --enable-cargo-online-mode, due to setting the $HOME
environment variable instead of $CARGO_HOME. Fixes bug 22830;
fix by Chelsea Komlo. Bugfix on 0.3.1.1-alpha.

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

@ -7,7 +7,7 @@ EXTRA_DIST +=\
src/rust/target/release/libtor_util.a: FORCE src/rust/target/release/libtor_util.a: FORCE
( cd "$(abs_top_srcdir)/src/rust/tor_util" ; \ ( cd "$(abs_top_srcdir)/src/rust/tor_util" ; \
CARGO_TARGET_DIR="$(abs_top_builddir)/src/rust/target" \ 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) ) $(CARGO) build --release --quiet $(CARGO_ONLINE) )
FORCE: FORCE:

2
src/test/test_rust.sh
View File

@ -7,7 +7,7 @@ exitcode=0
for crate in $crates; do for crate in $crates; do
cd "${abs_top_srcdir:-.}/src/rust/${crate}" 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 done
exit $exitcode exit $exitcode