From 71ee9439ca52cea88e7906a8f55435b3ba455a21 Mon Sep 17 00:00:00 2001
From: Alex Crichton <alex@alexcrichton.com>
Date: Fri, 27 Jul 2018 09:52:47 -0700
Subject: 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
---
 test/add_target.sh    | 3 +++
 test/build_openssl.sh | 8 ++++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

(limited to 'test')

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
-- 
cgit v1.2.3