Skip to content

Commit 8be23d8

Browse files
committed
_build.sh: only build a second libcurl if necessary [ci skip]
1 parent 37f8f86 commit 8be23d8

File tree

1 file changed

+19
-10
lines changed

1 file changed

+19
-10
lines changed

_build.sh

Lines changed: 19 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1765,17 +1765,26 @@ build_single_target() {
17651765
save_PP="${_PP}"
17661766
save_PPS="${_PPS}"
17671767

1768-
# Minimal curl configuration optimized for trurl
1769-
_CONFIG+='-zero-imap-osnotls-osnoidn-nohttp-nocurltool-nounity-CURLNOPKG'
1770-
1771-
_PKGDIR="_${_CPU}-${_OS}-${_CRT}-for-trurl"
1772-
_PKGDIRS="${_PKGDIR}"
1773-
_ZLIB=
1774-
_OPENSSL=
1775-
_PP="${_PKGDIR}${_PREFIX}"
1776-
_PPS="${_PKGDIRS}${_PREFIX}"
1768+
# Minimal curl configuration optimized for trurl (if differs from the main config)
1769+
if [[ "${_CONFIG}" != *'zero'* || \
1770+
"${_CONFIG}" != *'imap'* || \
1771+
"${_CONFIG}" != *'osnotls'* || \
1772+
"${_CONFIG}" != *'osnoidn'* || \
1773+
"${_CONFIG}" != *'nohttp'* || \
1774+
"${_CONFIG}" != *'nounity'* ]]; then
1775+
1776+
_CONFIG+='-zero-imap-osnotls-osnoidn-nohttp-nocurltool-nounity-CURLNOPKG'
1777+
1778+
_PKGDIR="_${_CPU}-${_OS}-${_CRT}-for-trurl"
1779+
_PKGDIRS="${_PKGDIR}"
1780+
_ZLIB=
1781+
_OPENSSL=
1782+
_PP="${_PKGDIR}${_PREFIX}"
1783+
_PPS="${_PKGDIRS}${_PREFIX}"
1784+
1785+
bld curl "${CURL_VER_}"
1786+
fi
17771787

1778-
bld curl "${CURL_VER_}"
17791788
bld trurl "${TRURL_VER_}"
17801789

17811790
_CONFIG="${save_CONFIG}"

0 commit comments

Comments
 (0)