Skip to content

Commit

Permalink
Rollup merge of rust-lang#40424 - alexcrichton:faster-travis-osx, r=b…
Browse files Browse the repository at this point in the history
…rson

travis: Remove compiling OpenSSL through homebrew

I don't believe that we need this any more now that `cargo-vendor` isn't
installed to create a source tarball (that only happens on Linux)
  • Loading branch information
alexcrichton committed Mar 11, 2017
2 parents b32393c + dcfc7ee commit d03b6b3
Showing 1 changed file with 1 addition and 3 deletions.
4 changes: 1 addition & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -67,9 +67,7 @@ matrix:
osx_image: xcode8.2
install: >
travis_retry curl -o /usr/local/bin/sccache https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror/2017-02-25-sccache-x86_64-apple-darwin &&
chmod +x /usr/local/bin/sccache &&
brew uninstall --ignore-dependencies openssl &&
brew install openssl --universal --without-test
chmod +x /usr/local/bin/sccache
- env: >
RUST_CHECK_TARGET=dist
RUST_CONFIGURE_ARGS="--target=aarch64-apple-ios,armv7-apple-ios,armv7s-apple-ios,i386-apple-ios,x86_64-apple-ios --enable-extended"
Expand Down

0 comments on commit d03b6b3

Please sign in to comment.