From 20b163db6b8086bf59f1e3e0def5512d34767c18 Mon Sep 17 00:00:00 2001 From: Wu Zhao Date: Wed, 13 Dec 2023 19:37:06 +0800 Subject: [PATCH] [!] fix build error with xqc_build.sh (#386) * [!] fix build error with xqc_build.sh --- cmake/CMakeLists.txt | 11 ----------- xqc_build.sh | 13 ++++++++++--- 2 files changed, 10 insertions(+), 14 deletions(-) diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt index 533009a4..cc90324b 100644 --- a/cmake/CMakeLists.txt +++ b/cmake/CMakeLists.txt @@ -293,17 +293,6 @@ if(XQC_ENABLE_UNLIMITED) endif() -if(XQC_ENABLE_TH3) - set(XQC_ENABLE_TUNNEL 1) - set( - TH3_SOURCES - "tunnel/tunnel_h3/th3_ctx.c" - "tunnel/tunnel_h3/th3_vconn.c" - ) -endif() - - ) -endif() if (XQC_NO_SHARED) set(XQC_BINARY_TYPE STATIC) diff --git a/xqc_build.sh b/xqc_build.sh index 865d570c..8778d11b 100755 --- a/xqc_build.sh +++ b/xqc_build.sh @@ -13,11 +13,16 @@ artifact_dir=$3 # boringssl is used as default ssl_type="boringssl" -ssl_path=third_party/boringssl - +ssl_path=$4 +# if ssl_path is not defined, try to use the default path if [ -z "$ssl_path" ] ; then - echo "ssl environment not specified" + ssl_path="`pwd`/third_party/boringssl" + echo "use default ssl path: $ssl_path" +fi + +if [ ! -d "$ssl_path" ] ; then + echo "ssl environment not exists" exit 0 fi @@ -44,6 +49,8 @@ if [ x"$platform" == xios ] ; then archs=${ios_archs[@]} configures="-DSSL_TYPE=${ssl_type} -DSSL_PATH=${ssl_path} + -DBORINGSSL_PREFIX=bs + -DBORINGSSL_PREFIX_SYMBOLS=$cur_dir/bssl_symbols.txt -DDEPLOYMENT_TARGET=10.0 -DCMAKE_BUILD_TYPE=Minsizerel -DXQC_ENABLE_TESTING=OFF