diff options
| author | Alex Crichton <[email protected]> | 2018-07-27 09:52:47 -0700 |
|---|---|---|
| committer | Alex Crichton <[email protected]> | 2018-07-30 15:15:24 -0700 |
| commit | 71ee9439ca52cea88e7906a8f55435b3ba455a21 (patch) | |
| tree | 1978cfea39baa4cf51c78afaa22a0cda07bc3516 /test | |
| parent | Merge pull request #965 from sfackler/fix-no-ec2m (diff) | |
| download | rust-openssl-71ee9439ca52cea88e7906a8f55435b3ba455a21.tar.xz rust-openssl-71ee9439ca52cea88e7906a8f55435b3ba455a21.zip | |
Support builds of OpenSSL from vendored source (take 2)
This is a revival of #684 to see if I can help push it across the finish line!
Closes #580
Diffstat (limited to 'test')
| -rwxr-xr-x | test/add_target.sh | 3 | ||||
| -rwxr-xr-x | test/build_openssl.sh | 8 |
2 files changed, 9 insertions, 2 deletions
diff --git a/test/add_target.sh b/test/add_target.sh index c9914ad2..8aef7d6a 100755 --- a/test/add_target.sh +++ b/test/add_target.sh @@ -8,6 +8,9 @@ case "${TARGET}" in "i686-unknown-linux-gnu") apt-get install -y --no-install-recommends gcc-multilib ;; +"x86_64-unknown-linux-musl") + apt-get install -y --no-install-recommends musl-tools + ;; "arm-unknown-linux-gnueabihf") dpkg --add-architecture armhf apt-get update diff --git a/test/build_openssl.sh b/test/build_openssl.sh index 9c1cda1e..a5250d11 100755 --- a/test/build_openssl.sh +++ b/test/build_openssl.sh @@ -5,8 +5,6 @@ if [ -d "${OPENSSL_DIR}" ]; then exit 0 fi -apt-get install -y --no-install-recommends curl - case "${LIBRARY}" in "libressl") URL1="http://ftp3.usa.openbsd.org/pub/OpenBSD/LibreSSL/libressl-${VERSION}.tar.gz" @@ -16,8 +14,14 @@ case "${LIBRARY}" in URL1="https://openssl.org/source/openssl-${VERSION}.tar.gz" URL2="http://mirrors.ibiblio.org/openssl/source/openssl-${VERSION}.tar.gz" ;; +"") + # using the vendored builds + exit 0; + ;; esac +apt-get install -y --no-install-recommends curl + case "${TARGET}" in "x86_64-unknown-linux-gnu") OS_COMPILER=linux-x86_64 |