mirror of
https://gitlab.torproject.org/tpo/core/tor.git
synced 2024-11-24 12:23:32 +01:00
Merge branch 'ticket24518'
This commit is contained in:
commit
5822496d69
4
changes/ticket24518
Normal file
4
changes/ticket24518
Normal file
@ -0,0 +1,4 @@
|
||||
o Minor bugfixes (build, rust):
|
||||
- Don't pass the --quiet option to cargo: it seems to suppress some
|
||||
errors, which is not what we want to do when building.
|
||||
Fixes bug 24518; bugfix on 0.3.1.7.
|
@ -2,17 +2,19 @@ EXTRA_DIST +=\
|
||||
src/rust/tor_rust/Cargo.toml \
|
||||
src/rust/tor_rust/lib.rs
|
||||
|
||||
EXTRA_CARGO_OPTIONS=
|
||||
|
||||
src/rust/target/release/@TOR_RUST_STATIC_NAME@: FORCE
|
||||
( cd "$(abs_top_srcdir)/src/rust/tor_rust" ; \
|
||||
CARGO_TARGET_DIR="$(abs_top_builddir)/src/rust/target" \
|
||||
CARGO_HOME="$(abs_top_builddir)/src/rust" \
|
||||
$(CARGO) build --release --quiet $(CARGO_ONLINE) )
|
||||
$(CARGO) build --release $(EXTRA_CARGO_OPTIONS) $(CARGO_ONLINE) )
|
||||
|
||||
distclean-rust:
|
||||
( cd "$(abs_top_srcdir)/src/rust/tor_rust" ; \
|
||||
CARGO_TARGET_DIR="$(abs_top_builddir)/src/rust/target" \
|
||||
CARGO_HOME="$(abs_top_builddir)/src/rust" \
|
||||
$(CARGO) clean --quiet $(CARGO_ONLINE) )
|
||||
$(CARGO) clean $(EXTRA_CARGO_OPTIONS) $(CARGO_ONLINE) )
|
||||
rm -rf "$(abs_top_builddir)/src/rust/registry"
|
||||
|
||||
if USE_RUST
|
||||
|
Loading…
Reference in New Issue
Block a user