Skip to content

Commit a6fdecc

Browse files
committedJan 23, 2025
Update release notes and build script for version 1.0.1 with Catalyst fix
1 parent 183a5af commit a6fdecc

File tree

3 files changed

+10
-5
lines changed

3 files changed

+10
-5
lines changed
 

‎RELEASE.md

+5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
# RELEASE NOTES
22

3+
## 1.0.1 - Catalyst Fix
4+
5+
* Fix build issue where bitcode compile was happening for Catalyst target.
6+
* Bitcode compile is now deprecated. The build script disables it. This is in prep to remove all bitcode logic from the script in the next release.
7+
38
## 1.0.0 - Platform Builds
49

510
* Updated build script to allow building for single platform targets: macOS, iOS or tvOS. Specify with `-p <platform>` switch. Default build is for "all" as it has been.

‎build.sh

+3-3
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ BUILD_MACHINE=`uname -m`
2424
BUILD_CMD=$*
2525

2626
# Script Version
27-
SCRIPT_VERSION="1.0.0"
27+
SCRIPT_VERSION="1.0.1"
2828

2929
# Compile Cache - Optional
3030
# export CMAKE_CXX_COMPILER_LAUNCHER="ccache"
@@ -57,7 +57,7 @@ BUILDFOR="all"
5757
# Global flags
5858
engine=""
5959
buildnghttp2="-n"
60-
disablebitcode=""
60+
disablebitcode="-b"
6161
colorflag=""
6262
catalyst=""
6363
sslv3=""
@@ -95,7 +95,7 @@ usage () {
9595
echo " -n <version> Build nghttp2 version (default $NGHTTP2)"
9696
echo " -d Compile without HTTP2 support"
9797
echo " -e Compile with OpenSSL engine support"
98-
echo " -b Compile without bitcode"
98+
echo " -b Compile without bitcode (deprecated)"
9999
echo " -m Compile Mac Catalyst library"
100100
echo " -u <version> Mac Catalyst iOS min target version (default $CATALYST_IOS)"
101101
echo " -3 Compile with SSLv3"

‎curl/libcurl-build.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -591,8 +591,8 @@ if [ $BUILDFOR == "macos" ] || [ $BUILDFOR == "all" ]; then
591591

592592
if [ $catalyst == "1" ]; then
593593
echo -e "${bold}Building Catalyst libraries${dim}"
594-
buildCatalyst "x86_64" "bitcode"
595-
buildCatalyst "arm64" "bitcode"
594+
buildCatalyst "x86_64" "${BITCODE}"
595+
buildCatalyst "arm64" "${BITCODE}"
596596

597597
lipo \
598598
"/tmp/${CURL_VERSION}-catalyst-x86_64-bitcode/lib/libcurl.a" \

0 commit comments

Comments
 (0)