]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Don't pass --quiet to cargo for now
authorNick Mathewson <nickm@torproject.org>
Mon, 4 Dec 2017 19:19:22 +0000 (14:19 -0500)
committerNick Mathewson <nickm@torproject.org>
Mon, 4 Dec 2017 19:19:22 +0000 (14:19 -0500)
Fixes bug 24518.

changes/ticket24518 [new file with mode: 0644]
src/rust/tor_rust/include.am

diff --git a/changes/ticket24518 b/changes/ticket24518
new file mode 100644 (file)
index 0000000..28d40a3
--- /dev/null
@@ -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.
index 90f37a9f1bf4c3b8ed7b510c09be6615e2275891..79361c33cc6f79b5bc545f8cbbe32f2ae7ad8ba2 100644 (file)
@@ -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