summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2021-01-06 00:50:49 +0100
committerDaniel Stenberg <daniel@haxx.se>2021-01-06 15:09:20 +0100
commit5808144f3cd25e931a352f39f85ad534e838f96c (patch)
tree99828782be329b2407489ca0862924d312eb120b
parent0936ecd0ee5e3e28c098fefc9e2c0e6847cb7a82 (diff)
downloadcurl-5808144f3cd25e931a352f39f85ad534e838f96c.tar.gz
travis: adapt to Hyper build change
Closes #6419
-rw-r--r--docs/HYPER.md2
-rwxr-xr-xscripts/travis/before_script.sh4
2 files changed, 3 insertions, 3 deletions
diff --git a/docs/HYPER.md b/docs/HYPER.md
index 724257260..88d6f854a 100644
--- a/docs/HYPER.md
+++ b/docs/HYPER.md
@@ -24,7 +24,7 @@ Build hyper and enable the C API:
% git clone -b hyper-capi https://github.com/hyperium/hyper
% cd hyper
- % cargo build --no-default-features --features ffi
+ % RUSTFLAGS="--cfg hyper_unstable_ffi" cargo build --features client,http1,http2,ffi
Build curl to use hyper's C API:
diff --git a/scripts/travis/before_script.sh b/scripts/travis/before_script.sh
index 162bbaf41..c82a97c62 100755
--- a/scripts/travis/before_script.sh
+++ b/scripts/travis/before_script.sh
@@ -6,7 +6,7 @@
# | (__| |_| | _ <| |___
# \___|\___/|_| \_\_____|
#
-# Copyright (C) 1998 - 2020, Daniel Stenberg, <daniel@haxx.se>, et al.
+# Copyright (C) 1998 - 2021, Daniel Stenberg, <daniel@haxx.se>, et al.
#
# This software is licensed as described in the file COPYING, which
# you should have received as part of this distribution. The terms
@@ -109,7 +109,7 @@ if [ "$TRAVIS_OS_NAME" = linux -a "$HYPER" ]; then
curl https://sh.rustup.rs -sSf | sh -s -- -y
source $HOME/.cargo/env
cd $HOME/hyper
- cargo build -v --no-default-features --features ffi
+ RUSTFLAGS="--cfg hyper_unstable_ffi" cargo build --features client,http1,http2,ffi
fi
if [ "$TRAVIS_OS_NAME" = linux -a "$QUICHE" ]; then