summaryrefslogtreecommitdiff
path: root/src/rust
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2018-08-21 20:04:03 -0400
committerNick Mathewson <nickm@torproject.org>2018-08-21 20:04:03 -0400
commitaac1e17f22acfc7338ec5290db55fbbfd8ddfdbf (patch)
tree5f41f54d6dde1313c72df4a1b15d1323bb76f8e8 /src/rust
parentf68aab83ba6ab61b010d4445b6c68a6cf780471a (diff)
parentc28da0d8e105515bafdb8a9710ab965a51b3c4eb (diff)
downloadtor-aac1e17f22acfc7338ec5290db55fbbfd8ddfdbf.tar.gz
tor-aac1e17f22acfc7338ec5290db55fbbfd8ddfdbf.zip
Merge remote-tracking branch 'teor/travis-osx-034' into maint-0.3.4
Diffstat (limited to 'src/rust')
-rw-r--r--src/rust/tor_rust/include.am2
1 files changed, 0 insertions, 2 deletions
diff --git a/src/rust/tor_rust/include.am b/src/rust/tor_rust/include.am
index bcf94193f4..99f3ede653 100644
--- a/src/rust/tor_rust/include.am
+++ b/src/rust/tor_rust/include.am
@@ -7,7 +7,6 @@ EXTRA_CARGO_OPTIONS=
@TOR_RUST_LIB_PATH@: 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 @@ EXTRA_CARGO_OPTIONS=
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" )