Skip to content

Commit 2b0a4c5

Browse files
authored
autoconf: Add lib flags for the quiche build test. (#9679)
* autoconf: Set "other-libraries"(with needed "-lssl -lcrypto") arguments for the quiche build test. * quiche build, use full path for boringssl
1 parent 9cd7e57 commit 2b0a4c5

File tree

2 files changed

+9
-3
lines changed

2 files changed

+9
-3
lines changed

build/quiche.m4

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ if test "$has_quiche" != "0"; then
6363
TS_ADDTO_RPATH(${quiche_ldflags})
6464
fi
6565
66-
AC_CHECK_LIB([quiche], quiche_connect, [quiche_have_libs=1])
66+
AC_CHECK_LIB([quiche], quiche_connect, [quiche_have_libs=1], [], [$OPENSSL_LIBS])
6767
if test "$quiche_have_libs" != "0"; then
6868
AC_CHECK_HEADERS(quiche.h, [quiche_have_headers=1])
6969
fi
@@ -80,6 +80,6 @@ fi
8080
],
8181
[
8282
AC_CHECK_HEADER([quiche.h], [], [has_quiche=0])
83-
AC_CHECK_LIB([quiche], quiche_connect, [:], [has_quiche=0])
83+
AC_CHECK_LIB([quiche], quiche_connect, [:], [has_quiche=0], [$OPENSSL_LIBS])
8484
])
8585
])

tools/build_h3_tools.sh

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ LDFLAGS=${LDFLAGS:-"-Wl,-rpath,${OPENSSL_PREFIX}/lib"}
3838

3939
if [ -e /etc/redhat-release ]; then
4040
MAKE="gmake"
41+
TMP_QUICHE_BSSL_PATH="${BASE}/boringssl/lib64"
4142
echo "+-------------------------------------------------------------------------+"
4243
echo "| You probably need to run this, or something like this, for your system: |"
4344
echo "| |"
@@ -50,6 +51,7 @@ if [ -e /etc/redhat-release ]; then
5051
echo
5152
echo
5253
elif [ -e /etc/debian_version ]; then
54+
TMP_QUICHE_BSSL_PATH="${BASE}/boringssl/lib"
5355
echo "+-------------------------------------------------------------------------+"
5456
echo "| You probably need to run this, or something like this, for your system: |"
5557
echo "| |"
@@ -63,6 +65,10 @@ elif [ -e /etc/debian_version ]; then
6365
echo
6466
fi
6567

68+
if [ -z ${QUICHE_BSSL_PATH+x} ]; then
69+
QUICHE_BSSL_PATH=${TMP_QUICHE_BSSL_PATH:-"${BASE}/boringssl/lib"}
70+
fi
71+
6672
set -x
6773
if [ `uname -s` = "Linux" ]
6874
then
@@ -122,7 +128,7 @@ echo "Building quiche"
122128
QUICHE_BASE="${BASE:-/opt}/quiche"
123129
[ ! -d quiche ] && git clone --recursive https://github.com/cloudflare/quiche.git
124130
cd quiche
125-
QUICHE_BSSL_PATH=${BASE}/boringssl QUICHE_BSSL_LINK_KIND=dylib cargo build -j4 --package quiche --release --features ffi,pkg-config-meta,qlog
131+
QUICHE_BSSL_PATH=${QUICHE_BSSL_PATH} QUICHE_BSSL_LINK_KIND=dylib cargo build -j4 --package quiche --release --features ffi,pkg-config-meta,qlog
126132
sudo mkdir -p ${QUICHE_BASE}/lib/pkgconfig
127133
sudo mkdir -p ${QUICHE_BASE}/include
128134
sudo cp target/release/libquiche.a ${QUICHE_BASE}/lib/

0 commit comments

Comments
 (0)