tor

commit 5822496d69f670766b97b59bf3b2963d9bd6f37f
parent ff0db77f91ed7d4d265bc3dd01b1d6925537f639
Author: Nick Mathewson <nickm@torproject.org>
Date:   Mon,  4 Dec 2017 15:56:17 -0500

Merge branch 'ticket24518'

Diffstat:
A
changes/ticket24518
 | 
4
++++
M
src/rust/tor_rust/include.am
 | 
6
++++--

2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/changes/ticket24518 b/changes/ticket24518
@@ -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.
diff --git a/src/rust/tor_rust/include.am b/src/rust/tor_rust/include.am
@@ -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