summaryrefslogtreecommitdiff
path: root/.travis.yml
diff options
context:
space:
mode:
authorAlessandro Ghedini <alessandro@ghedini.me>2019-08-18 15:03:51 +0100
committerDaniel Stenberg <daniel@haxx.se>2019-08-20 15:04:58 +0200
commit08b99e17df5a2d1d98a2d9ab06eedf7405906105 (patch)
treec0e2bdfeb38c93906931721eec3925ab6a9264a9 /.travis.yml
parent6a90c9e0c49dc8179f6ff60bdfe1bd59aa55ef7b (diff)
downloadcurl-08b99e17df5a2d1d98a2d9ab06eedf7405906105.tar.gz
configure: use pkg-config to detect quiche
This removes the need to hard-code the quiche target path in configure.ac. This depends on https://github.com/cloudflare/quiche/pull/128 Closes #4237
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml4
1 files changed, 2 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml
index 810ebb8f2..0a03e3bba 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -101,7 +101,7 @@ matrix:
compiler: gcc
dist: xenial
env:
- - T=novalgrind BORINGSSL=yes QUICHE="yes" C="--with-ssl=$HOME/boringssl --with-quiche=$home/quiche --enable-alt-svc" LD_LIBRARY_PATH=/home/travis/boringssl/lib:/usr/local/lib
+ - T=novalgrind BORINGSSL=yes QUICHE="yes" C="--with-ssl=$HOME/boringssl --with-quiche=$HOME/quiche/target/release --enable-alt-svc" LD_LIBRARY_PATH=/home/travis/boringssl/lib:$HOME/quiche/target/release:/usr/local/lib
- OVERRIDE_CC="CC=gcc-8" OVERRIDE_CXX="CXX=g++-8"
addons:
apt:
@@ -435,7 +435,7 @@ before_script:
curl https://sh.rustup.rs -sSf | sh -s -- -y &&
source $HOME/.cargo/env &&
cd quiche &&
- QUICHE_BSSL_PATH=$HOME/boringssl cargo build -v --release)
+ QUICHE_BSSL_PATH=$HOME/boringssl cargo build -v --release --features pkg-config-meta)
fi
- |
if [ $TRAVIS_OS_NAME = linux ]; then