diff --git a/dist-build/apple-xcframework.sh b/dist-build/apple-xcframework.sh index f267230a..213e5429 100755 --- a/dist-build/apple-xcframework.sh +++ b/dist-build/apple-xcframework.sh @@ -12,8 +12,6 @@ export WATCHOS32_PREFIX="${PREFIX}/tmp/watchos32" export WATCHOS64_32_PREFIX="${PREFIX}/tmp/watchos64_32" export WATCHOS_SIMULATOR_I386_PREFIX="${PREFIX}/tmp/watchos-simulator-i386" export WATCHOS_SIMULATOR_X86_64_PREFIX="${PREFIX}/tmp/watchos-simulator-x86_64" -export CATALYST_ARM64_PREFIX="${PREFIX}/tmp/catalyst-arm64" -export CATALYST_X86_64_PREFIX="${PREFIX}/tmp/catalyst-x86_64" export LOG_FILE="${PREFIX}/tmp/build_log" export XCODEDIR="$(xcode-select -p)" @@ -175,32 +173,6 @@ build_watchos_simulator() { make -j${PROCESSORS} install || exit 1 } -build_catalyst() { - export BASEDIR="${XCODEDIR}/Platforms/MacOSX.platform/Developer" - export PATH="${BASEDIR}/usr/bin:$BASEDIR/usr/sbin:$PATH" - export SDK="${BASEDIR}/SDKs/MacOSX.sdk" - - ## arm64 catalyst - if [ "$(arch)" = "arm64" ]; then - export CFLAGS="-fembed-bitcode -O2 -arch arm64 -target arm64-apple-ios13.0-macabi -isysroot ${SDK}" - export LDFLAGS="-fembed-bitcode -arch arm64 -target arm64-apple-ios13.0-macabi -isysroot ${SDK}" - - make distclean >/dev/null 2>&1 - ./configure --host=arm-apple-darwin20 --prefix="$CATALYST_ARM64_PREFIX" \ - ${LIBSODIUM_ENABLE_MINIMAL_FLAG} || exit 1 - make -j${PROCESSORS} install || exit 1 - fi - - ## x86_64 catalyst - export CFLAGS="-fembed-bitcode -O2 -arch x86_64 -target x86_64-apple-ios13.0-macabi -isysroot ${SDK}" - export LDFLAGS="-fembed-bitcode -arch x86_64 -target x86_64-apple-ios13.0-macabi -isysroot ${SDK}" - - make distclean >/dev/null 2>&1 - ./configure --host=x86_64-apple-darwin10 --prefix="$CATALYST_X86_64_PREFIX" \ - ${LIBSODIUM_ENABLE_MINIMAL_FLAG} || exit 1 - make -j${PROCESSORS} install || exit 1 -} - mkdir -p "${PREFIX}/tmp" echo "Building for macOS..." build_macos >"$LOG_FILE" 2>&1 || exit 1 @@ -212,8 +184,6 @@ echo "Building for watchOS..." build_watchos >"$LOG_FILE" 2>&1 || exit 1 echo "Building for the watchOS simulator..." build_watchos_simulator >"$LOG_FILE" 2>&1 || exit 1 -echo "Building for Catalyst..." -build_catalyst >"$LOG_FILE" 2>&1 || exit 1 echo "Adding the Clibsodium module map for Swift..." @@ -283,29 +253,12 @@ for ext in a dylib; do -output "${PREFIX}/watchos-simulators/lib/libsodium.${ext}" done -echo "Bundling Catalyst targets..." - -mkdir -p "${PREFIX}/catalyst/lib" -cp -a "${CATALYST_X86_64_PREFIX}/include" "${PREFIX}/catalyst/" -for ext in a dylib; do - if [ "$(arch)" = "arm64" ]; then - lipo -create \ - "${CATALYST_ARM64_PREFIX}/lib/libsodium.${ext}" \ - "${CATALYST_X86_64_PREFIX}/lib/libsodium.${ext}" \ - -output "${PREFIX}/catalyst/lib/libsodium.${ext}" - else - lipo -create \ - "${CATALYST_X86_64_PREFIX}/lib/libsodium.${ext}" \ - -output "${PREFIX}/catalyst/lib/libsodium.${ext}" - fi -done - echo "Creating Clibsodium.xcframework..." rm -rf "${PREFIX}/Clibsodium.xcframework" XCFRAMEWORK_ARGS="" -for f in macos ios ios-simulators watchos watchos-simulators catalyst; do +for f in macos ios ios-simulators watchos watchos-simulators; do XCFRAMEWORK_ARGS="${XCFRAMEWORK_ARGS} -library ${PREFIX}/${f}/lib/libsodium.a" XCFRAMEWORK_ARGS="${XCFRAMEWORK_ARGS} -headers ${PREFIX}/${f}/include" done