From 338b0b073d0bac8451e9d180edcfbba81888d010 Mon Sep 17 00:00:00 2001
From: Alex Gaynor <alex.gaynor@gmail.com>
Date: Mon, 8 Oct 2018 21:24:33 -0400
Subject: Fixes #4459 -- switch all our builds to xenial on travis (#4486)

* Fixes #4459 -- switch all our builds to xenial on travis

* Attempt to fix tests

* Try disabling sudo?

* typo

* try this?

* shellcheck
---
 .travis/install.sh | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

(limited to '.travis')

diff --git a/.travis/install.sh b/.travis/install.sh
index 0aecb2bd..20a88312 100755
--- a/.travis/install.sh
+++ b/.travis/install.sh
@@ -23,9 +23,14 @@ if [ -n "${OPENSSL}" ]; then
         shlib_sed
         make depend
         make -j"$(nproc)"
-        # avoid installing the docs
-        # https://github.com/openssl/openssl/issues/6685#issuecomment-403838728
-        make install_sw install_ssldirs
+        if [[ "${OPENSSL}" =~ 1.0.1 ]]; then
+            # OpenSSL 1.0.1 doesn't support installing without the docs.
+            make install
+        else
+            # avoid installing the docs
+            # https://github.com/openssl/openssl/issues/6685#issuecomment-403838728
+            make install_sw install_ssldirs
+        fi
         popd
     fi
 elif [ -n "${LIBRESSL}" ]; then
-- 
cgit v1.2.3