From e9f9ede1fa23a59a4514f8222344b98e0c1f386c Mon Sep 17 00:00:00 2001
From: Alex Crichton <alex@alexcrichton.com>
Date: Sat, 4 Aug 2018 22:56:42 -0700
Subject: [PATCH] Switch to openssl's `vendored` feature for musl builds

This should give us updates for free!
---
 .travis.yml           | 10 +---------
 crates/cli/Cargo.toml |  4 ++++
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 113e6a0e..ff05fdaf 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -140,15 +140,7 @@ matrix:
     - rust: nightly
       env: JOB=dist-linux TARGET=x86_64-unknown-linux-musl
       before_script: rustup target add $TARGET
-      install:
-        - travis_retry curl -O https://www.openssl.org/source/openssl-1.0.2o.tar.gz
-        - tar xf openssl-1.0.2o.tar.gz
-        - (cd openssl-1.0.2o &&
-          CC=musl-gcc ./Configure --prefix=$HOME/openssl-musl no-dso no-ssl2 no-ssl3 linux-x86_64 -fPIC &&
-          make -j$(nproc) &&
-          make install)
-        - export OPENSSL_DIR=$HOME/openssl-musl
-      script: cargo build --manifest-path crates/cli/Cargo.toml --release --target $TARGET
+      script: cargo build --manifest-path crates/cli/Cargo.toml --release --target $TARGET --features vendored-openssl
       addons:
         apt:
           packages:
diff --git a/crates/cli/Cargo.toml b/crates/cli/Cargo.toml
index 9aa6661f..3e953e79 100644
--- a/crates/cli/Cargo.toml
+++ b/crates/cli/Cargo.toml
@@ -25,3 +25,7 @@ serde_derive = "1.0"
 serde_json = "1.0"
 wasm-bindgen-cli-support = { path = "../cli-support", version = "=0.2.15" }
 wasm-bindgen-shared = { path = "../shared", version = "=0.2.15" }
+openssl = { version = '0.10.11', optional = true }
+
+[features]
+vendored-openssl = ['openssl/vendored']