summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorPeter Wu <peter@lekensteyn.nl>2020-05-10 16:53:00 +0200
committerPeter Wu <peter@lekensteyn.nl>2020-05-22 21:10:07 +0200
commit421171a8d4d8a59a02fa471d049280b33ea0e48a (patch)
treee63213217b1fc089c15f0cec653f21cdfaa174ff /scripts
parent06e266e0a5c877e692eab8a653a1ea47adfae43e (diff)
downloadcurl-421171a8d4d8a59a02fa471d049280b33ea0e48a.tar.gz
travis: simplify quiche build instructions wrt boringssl
quiche builds boringssl as static library, reuse that instead of building another shared library. Closes #5438
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/travis/before_script.sh6
1 files changed, 4 insertions, 2 deletions
diff --git a/scripts/travis/before_script.sh b/scripts/travis/before_script.sh
index 28b563e2e..a2551ac06 100755
--- a/scripts/travis/before_script.sh
+++ b/scripts/travis/before_script.sh
@@ -91,11 +91,13 @@ fi
if [ "$TRAVIS_OS_NAME" = linux -a "$QUICHE" ]; then
cd $HOME
- git clone --depth=1 https://github.com/cloudflare/quiche.git
+ git clone --depth=1 --recursive https://github.com/cloudflare/quiche.git
curl https://sh.rustup.rs -sSf | sh -s -- -y
source $HOME/.cargo/env
cd $HOME/quiche
- QUICHE_BSSL_PATH=$HOME/boringssl cargo build -v --release --features pkg-config-meta,qlog
+ cargo build -v --release --features pkg-config-meta,qlog
+ mkdir -v deps/boringssl/lib
+ ln -vnf $(find target/release -name libcrypto.a -o -name libssl.a) deps/boringssl/lib/
fi
# Install common libraries.