Skip to content

Commit 64f71ae

Browse files
committed
Catalyst conditionals
1 parent bf8cd13 commit 64f71ae

File tree

1 file changed

+8
-5
lines changed

1 file changed

+8
-5
lines changed

build.sh

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -98,9 +98,12 @@ shift $((OPTIND-1))
9898

9999
## Welcome
100100
echo -e "${bold}Build-OpenSSL-cURL${dim}"
101-
echo "This script builds OpenSSL, nghttp2 and libcurl for MacOS (OS X), iOS and tvOS devices."
101+
if [ "$catalyst" == "-m" ]; then
102+
echo "This script builds OpenSSL, nghttp2 and libcurl for MacOS, Catalyst [beta], iOS and tvOS devices."
103+
else
104+
echo "This script builds OpenSSL, nghttp2 and libcurl for MacOS, iOS and tvOS devices."
105+
fi
102106
echo "Targets: x86_64, armv7, armv7s, arm64 and arm64e"
103-
echo
104107

105108
## Start Counter
106109
START=$(date +%s)
@@ -159,7 +162,7 @@ mkdir -p "$ARCHIVE/lib/iOS-simulator"
159162
mkdir -p "$ARCHIVE/lib/iOS-fat"
160163
mkdir -p "$ARCHIVE/lib/MacOS"
161164
mkdir -p "$ARCHIVE/lib/tvOS"
162-
if [ $catalyst == "-m" ]; then
165+
if [ "$catalyst" == "-m" ]; then
163166
mkdir -p "$ARCHIVE/lib/Catalyst"
164167
fi
165168
mkdir -p "$ARCHIVE/bin"
@@ -184,7 +187,7 @@ cp openssl/iOS-fat/lib/libssl.a $ARCHIVE/lib/iOS-fat/libssl.a
184187
cp openssl/tvOS/lib/libssl.a $ARCHIVE/lib/tvOS/libssl.a
185188
cp openssl/Mac/lib/libssl.a $ARCHIVE/lib/MacOS/libssl.a
186189

187-
if [ $catalyst == "-m" ]; then
190+
if [ "$catalyst" == "-m" ]; then
188191
cp curl/lib/libcurl_Catalyst.a $ARCHIVE/lib/Catalyst/libcurl.a
189192
cp openssl/Catalyst/lib/libcrypto.a $ARCHIVE/lib/Catalyst/libcrypto.a
190193
cp openssl/Catalyst/lib/libssl.a $ARCHIVE/lib/Catalyst/libssl.a
@@ -198,7 +201,7 @@ if [ "$buildnghttp2" != "" ]; then
198201
cp nghttp2/lib/libnghttp2_iOS-fat.a $ARCHIVE/lib/iOS-fat/libnghttp2.a
199202
cp nghttp2/lib/libnghttp2_tvOS.a $ARCHIVE/lib/tvOS/libnghttp2.a
200203
cp nghttp2/lib/libnghttp2_Mac.a $ARCHIVE/lib/MacOS/libnghttp2.a
201-
if [ $catalyst == "-m" ]; then
204+
if [ "$catalyst" == "-m" ]; then
202205
cp nghttp2/lib/libnghttp2_Catalyst.a $ARCHIVE/lib/Catalyst/libnghttp2.a
203206
fi
204207
fi

0 commit comments

Comments
 (0)