diff options
| author | teor <teor@torproject.org> | 2018-08-10 13:28:19 +1000 |
|---|---|---|
| committer | teor <teor@torproject.org> | 2018-08-10 13:28:19 +1000 |
| commit | ace98493bd8cc9b1227648bba29cb9686ecc4056 (patch) | |
| tree | 948c4050bf8f54c47cfdad2d945732ba165227c8 /src/rust/tor_rust | |
| parent | df444e482bc083b4c4239b8fb4d532ebffaae5a8 (diff) | |
| parent | 2a33edc595a619d6c2abcb260195f92d97192d6a (diff) | |
| download | tor-ace98493bd8cc9b1227648bba29cb9686ecc4056.tar.gz tor-ace98493bd8cc9b1227648bba29cb9686ecc4056.zip | |
Merge branch 'travis-osx-034' into travis-osx-master
Replace master .travis.yml with 034 .travis.yml.
All the changes in master have been backported to the
034 .travis.yml already.
Replace master src/test/test_rust.sh with 034
src/test/test_rust.sh, which was backported from
master. One 033/034-specific commit needs to be
reverted.
Diffstat (limited to 'src/rust/tor_rust')
| -rw-r--r-- | src/rust/tor_rust/include.am | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/rust/tor_rust/include.am b/src/rust/tor_rust/include.am index ecc821a887..ce673abbee 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" ) |