]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'maint-0.2.9' into maint-0.3.2
authorNick Mathewson <nickm@torproject.org>
Wed, 5 Sep 2018 14:15:42 +0000 (10:15 -0400)
committerNick Mathewson <nickm@torproject.org>
Wed, 5 Sep 2018 14:15:42 +0000 (10:15 -0400)
1  2 
.travis.yml

diff --cc .travis.yml
index a64b5e61f252a28d8cfa90c6aaebf788a0a00480,a323b4ecd4917f0f79dcbd1a72ed28c9d7db2149..82eced41b2d31ce5239c1041db9221575e6845eb
@@@ -169,8 -133,8 +169,8 @@@ install
  
  script:
    - ./autogen.sh
 -  - CONFIGURE_FLAGS="$ASCIIDOC_OPTIONS $COVERAGE_OPTIONS $HARDENING_OPTIONS $OPENSSL_OPTIONS --enable-fatal-warnings --disable-silent-rules"
 +  - CONFIGURE_FLAGS="$ASCIIDOC_OPTIONS $COVERAGE_OPTIONS $HARDENING_OPTIONS $OPENSSL_OPTIONS $RUST_OPTIONS --enable-fatal-warnings --disable-silent-rules"
-   - echo $CONFIGURE_FLAGS
+   - echo "Configure flags are $CONFIGURE_FLAGS"
    - ./configure $CONFIGURE_FLAGS
    ## We run `make check` because that's what https://jenkins.torproject.org does.
    - if [[ "$DISTCHECK" == "" ]]; then make check; fi