Browse Source

Don't pass --quiet to cargo for now

Fixes bug 24518.
Nick Mathewson 7 years ago
parent
commit
0694a6dc01
2 changed files with 8 additions and 2 deletions
  1. 4 0
      changes/ticket24518
  2. 4 2
      src/rust/tor_rust/include.am

+ 4 - 0
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.

+ 4 - 2
src/rust/tor_rust/include.am

@@ -2,17 +2,19 @@ EXTRA_DIST +=\
 	src/rust/tor_rust/Cargo.toml \
 	src/rust/tor_rust/Cargo.toml \
 	src/rust/tor_rust/lib.rs
 	src/rust/tor_rust/lib.rs
 
 
+EXTRA_CARGO_OPTIONS=
+
 src/rust/target/release/@TOR_RUST_STATIC_NAME@: FORCE
 src/rust/target/release/@TOR_RUST_STATIC_NAME@: FORCE
 	( cd "$(abs_top_srcdir)/src/rust/tor_rust" ; \
 	( cd "$(abs_top_srcdir)/src/rust/tor_rust" ; \
 		CARGO_TARGET_DIR="$(abs_top_builddir)/src/rust/target" \
 		CARGO_TARGET_DIR="$(abs_top_builddir)/src/rust/target" \
 		CARGO_HOME="$(abs_top_builddir)/src/rust" \
 		CARGO_HOME="$(abs_top_builddir)/src/rust" \
-		$(CARGO) build --release --quiet $(CARGO_ONLINE) )
+		$(CARGO) build --release $(EXTRA_CARGO_OPTIONS) $(CARGO_ONLINE) )
 
 
 distclean-rust:
 distclean-rust:
 	( cd "$(abs_top_srcdir)/src/rust/tor_rust" ; \
 	( cd "$(abs_top_srcdir)/src/rust/tor_rust" ; \
 		CARGO_TARGET_DIR="$(abs_top_builddir)/src/rust/target" \
 		CARGO_TARGET_DIR="$(abs_top_builddir)/src/rust/target" \
 		CARGO_HOME="$(abs_top_builddir)/src/rust" \
 		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"
 	rm -rf "$(abs_top_builddir)/src/rust/registry"
 
 
 if USE_RUST
 if USE_RUST