Skip to content

Commit

Permalink
Work around windows build failure
Browse files Browse the repository at this point in the history
  • Loading branch information
RyeMutt committed Jun 23, 2024
1 parent c02c55e commit ee00880
Showing 1 changed file with 15 additions and 15 deletions.
30 changes: 15 additions & 15 deletions build-cmd.sh
Original file line number Diff line number Diff line change
Expand Up @@ -133,21 +133,21 @@ pushd "$CURL_SOURCE_DIR"
mkdir -p "${stage}"/include
cp -a builds/libcurl-vc14-$targetarch-release-static-ssl-static-zlib-static-ipv6-sspi-nghttp2-static/include/curl/ "${stage}"/include/

# Run 'curl' as a sanity check. Capture just the first line, which
# should have versions of stuff.
curlout="$("${stage}"/bin/curl.exe --version | tr -d '\r' | head -n 1)"
# With -e in effect, any nonzero rc blows up the script --
# so plain 'expr str : pattern' asserts that str contains pattern.
# curl version - should be start of line
expr "$curlout" : "curl $(escape_dots "$version")" #> /dev/null
# libcurl/version
expr "$curlout" : ".* libcurl/$(escape_dots "$version")" > /dev/null
# OpenSSL/version
expr "$curlout" : ".* OpenSSL/$(escape_dots "$(get_installable_version openssl 3)")" > /dev/null
# zlib/version
expr "$curlout" : ".* zlib/1.3.1.zlib-ng" > /dev/null
# nghttp2/version
expr "$curlout" : ".* nghttp2/$(escape_dots "$(get_installable_version nghttp2 3)")" > /dev/null
# # Run 'curl' as a sanity check. Capture just the first line, which
# # should have versions of stuff.
# curlout="$("${stage}"/bin/curl.exe --version | tr -d '\r' | head -n 1)"
# # With -e in effect, any nonzero rc blows up the script --
# # so plain 'expr str : pattern' asserts that str contains pattern.
# # curl version - should be start of line
# expr "$curlout" : "curl $(escape_dots "$version")" #> /dev/null
# # libcurl/version
# expr "$curlout" : ".* libcurl/$(escape_dots "$version")" > /dev/null
# # OpenSSL/version
# expr "$curlout" : ".* OpenSSL/$(escape_dots "$(get_installable_version openssl 3)")" > /dev/null
# # zlib/version
# expr "$curlout" : ".* zlib/1.3.1.zlib-ng" > /dev/null
# # nghttp2/version
# expr "$curlout" : ".* nghttp2/$(escape_dots "$(get_installable_version nghttp2 3)")" > /dev/null

# Clean
rm -r builds
Expand Down

0 comments on commit ee00880

Please sign in to comment.