summaryrefslogtreecommitdiff
path: root/docs
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 /docs
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 'docs')
-rw-r--r--docs/HTTP3.md24
1 files changed, 5 insertions, 19 deletions
diff --git a/docs/HTTP3.md b/docs/HTTP3.md
index e84f50021..051655f5c 100644
--- a/docs/HTTP3.md
+++ b/docs/HTTP3.md
@@ -112,26 +112,12 @@ Build curl
## build
-Clone quiche and BoringSSL:
+Build quiche and BoringSSL:
% git clone --recursive https://github.com/cloudflare/quiche
-
-Build BoringSSL (it needs to be built manually so it can be reused with curl):
-
- % cd quiche/deps/boringssl
- % mkdir build
- % cd build
- % cmake -DCMAKE_POSITION_INDEPENDENT_CODE=on ..
- % make
- % cd ..
- % mkdir -p .openssl/lib
- % cp build/crypto/libcrypto.a build/ssl/libssl.a .openssl/lib
- % ln -s $PWD/include .openssl
-
-Build quiche:
-
- % cd ../..
- % QUICHE_BSSL_PATH=$PWD/deps/boringssl cargo build --release --features pkg-config-meta,qlog
+ % cargo build --release --features pkg-config-meta,qlog
+ % mkdir deps/boringssl/lib
+ % ln -vnf $(find target/release -name libcrypto.a -o -name libssl.a) deps/boringssl/lib/
Build curl:
@@ -139,7 +125,7 @@ Build curl:
% git clone https://github.com/curl/curl
% cd curl
% ./buildconf
- % ./configure LDFLAGS="-Wl,-rpath,$PWD/../quiche/target/release" --with-ssl=$PWD/../quiche/deps/boringssl/.openssl --with-quiche=$PWD/../quiche/target/release --enable-alt-svc
+ % ./configure LDFLAGS="-Wl,-rpath,$PWD/../quiche/target/release" --with-ssl=$PWD/../quiche/deps/boringssl --with-quiche=$PWD/../quiche/target/release --enable-alt-svc
% make
## Run