Fix bug in Mac Catalyst and update to 15.0 default

Author: jasonacox

README.md

@@ -28,7 +28,7 @@ The build script accepts several arguments to adjust versions and toggle feature
          -e             Compile with OpenSSL engine support
          -b             Compile without bitcode
          -m             Compile Mac Catalyst library
-         -u <version>   Mac Catalyst iOS min target version (default 13.0)
+         -u <version>   Mac Catalyst iOS min target version (default 15.0)
          -3             Compile with SSLv3
          -s <version>   iOS min target version (default 8.0)
          -t <version>   tvOS min target version (default 9.0)
@@ -40,7 +40,7 @@ The build script accepts several arguments to adjust versions and toggle feature
 
 _OpenSSL Engine Note: By default, the OpenSSL source disables ENGINE support for iOS builds.  To force this active use this and the static engine support will be included:_ `./build.sh -e`
 
-_Mac Catalyst Note: Static libraries can be built for Mac Catalyst. This requires a current version of Xcode (11.6+). To build Catalyst binaries use the switch:_ `./build.sh -m`
+_Mac Catalyst Note: Static libraries can be built for Mac Catalyst. This often requires that you specify an recent Mac Catalyst iOS target version (e.g. 15.0). To build Catalyst binaries use the -m switch and specify the iOS target with -u:_ `./build.sh -m -u 15.0`
 
 Minimum macOS, iOS and tvOS target build versions are set by default in the build scripts or can be specified using command line arguments indicated above.  Apple Silicon arm64 macOS targets will need to be 11.0 or higher.
 

build.sh

@@ -22,7 +22,7 @@ BUILD_MACHINE=`uname -m`
 # Set minimum OS versions for target
 MACOS_X86_64_VERSION=""			# Empty = use host version
 MACOS_ARM64_VERSION=""			# Min supported is MacOS 11.0 Big Sur
-CATALYST_IOS="13.0"				# Min supported is iOS 13.0 for Mac Catalyst
+CATALYST_IOS="15.0"				# Min supported is iOS 15.0 for Mac Catalyst
 IOS_MIN_SDK_VERSION="8.0"
 TVOS_MIN_SDK_VERSION="9.0"
 
@@ -154,7 +154,7 @@ OSARGS="-s ${IOS_MIN_SDK_VERSION} -t ${TVOS_MIN_SDK_VERSION} -i ${MACOS_X86_64_V
 
 ## Welcome
 echo -e "${bold}Build-OpenSSL-cURL${dim}"
-if [ "$catalyst" == "-m" ]; then
+if [ "$catalyst" != "" ]; then
 	echo "This script builds OpenSSL, nghttp2 and libcurl for MacOS, Catalyst, iOS and tvOS devices."
 else
 	echo "This script builds OpenSSL, nghttp2 and libcurl for MacOS, iOS and tvOS devices."
@@ -220,8 +220,8 @@ mkdir -p "$ARCHIVE/lib/iOS-fat"
 mkdir -p "$ARCHIVE/lib/MacOS"
 mkdir -p "$ARCHIVE/lib/tvOS"
 mkdir -p "$ARCHIVE/lib/tvOS-simulator"
-if [ "$catalyst" == "-m" ]; then
-mkdir -p "$ARCHIVE/lib/Catalyst"
+if [ "$catalyst" != "" ]; then
+	mkdir -p "$ARCHIVE/lib/Catalyst"
 fi
 mkdir -p "$ARCHIVE/bin"
 mkdir -p "$ARCHIVE/framework"
@@ -249,7 +249,7 @@ cp openssl/tvOS/lib/libssl.a $ARCHIVE/lib/tvOS/libssl.a
 cp openssl/tvOS-simulator/lib/libssl.a $ARCHIVE/lib/tvOS-simulator/libssl.a
 cp openssl/Mac/lib/libssl.a $ARCHIVE/lib/MacOS/libssl.a
 
-if [ "$catalyst" == "-m" ]; then
+if [ "$catalyst" != "" ]; then
 	# Add catalyst libraries
 	cp curl/lib/libcurl_Catalyst.a $ARCHIVE/lib/Catalyst/libcurl.a
 	cp openssl/Catalyst/lib/libcrypto.a $ARCHIVE/lib/Catalyst/libcrypto.a
@@ -310,7 +310,7 @@ if [ "$buildnghttp2" != "" ]; then
 	cp nghttp2/lib/libnghttp2_tvOS.a $ARCHIVE/lib/tvOS/libnghttp2.a
 	cp nghttp2/lib/libnghttp2_tvOS-simulator.a $ARCHIVE/lib/tvOS-simulator/libnghttp2.a
 	cp nghttp2/lib/libnghttp2_Mac.a $ARCHIVE/lib/MacOS/libnghttp2.a
-	if [ "$catalyst" == "-m" ]; then
+	if [ "$catalyst" != "" ]; then
 		cp nghttp2/lib/libnghttp2_Catalyst.a $ARCHIVE/lib/Catalyst/libnghttp2.a
 		xcodebuild -create-xcframework \
 			-library $ARCHIVE/lib/iOS/libnghttp2.a \

example/iOS Test App/README.md

@@ -7,14 +7,11 @@ This is a test app for iOS using the curl, openssl and nghttp2 libraries.
 Build the libraries with Mac Catalyst support:
 
 ```bash
-# For x86-64 Build Nodes
-./build.sh -m
-
-# For arm64 (m1) Build nodes
-./build.sh
+# Build Mac Catalyst Support for iOS Target 15.0
+./build.sh -m -u 15.0
 ```
 
-Load and build the project using Xcode (tested with version 8.2). Example lib binaries (xcframework)and header files are included but will be replaced when you run the build script.
+Load and build the project using Xcode. Example lib binaries (xcframework)and header files are included but will be replaced when you run the build script.
 
 ## Screenshot