Skip to content

Commit e9f9ede

Browse files
committed
Switch to openssl's vendored feature for musl builds
This should give us updates for free!
1 parent 5b66045 commit e9f9ede

File tree

2 files changed

+5
-9
lines changed

2 files changed

+5
-9
lines changed

.travis.yml

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -140,15 +140,7 @@ matrix:
140140
- rust: nightly
141141
env: JOB=dist-linux TARGET=x86_64-unknown-linux-musl
142142
before_script: rustup target add $TARGET
143-
install:
144-
- travis_retry curl -O https://www.openssl.org/source/openssl-1.0.2o.tar.gz
145-
- tar xf openssl-1.0.2o.tar.gz
146-
- (cd openssl-1.0.2o &&
147-
CC=musl-gcc ./Configure --prefix=$HOME/openssl-musl no-dso no-ssl2 no-ssl3 linux-x86_64 -fPIC &&
148-
make -j$(nproc) &&
149-
make install)
150-
- export OPENSSL_DIR=$HOME/openssl-musl
151-
script: cargo build --manifest-path crates/cli/Cargo.toml --release --target $TARGET
143+
script: cargo build --manifest-path crates/cli/Cargo.toml --release --target $TARGET --features vendored-openssl
152144
addons:
153145
apt:
154146
packages:

crates/cli/Cargo.toml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,3 +25,7 @@ serde_derive = "1.0"
2525
serde_json = "1.0"
2626
wasm-bindgen-cli-support = { path = "../cli-support", version = "=0.2.15" }
2727
wasm-bindgen-shared = { path = "../shared", version = "=0.2.15" }
28+
openssl = { version = '0.10.11', optional = true }
29+
30+
[features]
31+
vendored-openssl = ['openssl/vendored']

0 commit comments

Comments
 (0)