From 6388063c850ab9033735f8577536f340c9c10c6c Mon Sep 17 00:00:00 2001 From: Frank Denis Date: Tue, 21 Jul 2020 14:14:08 +0200 Subject: [PATCH] ios.sh: build the XCFramework in a single pass Via @Westacular @svdo Fixes #985 --- dist-build/ios.sh | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/dist-build/ios.sh b/dist-build/ios.sh index 9b948796..36ffde2e 100755 --- a/dist-build/ios.sh +++ b/dist-build/ios.sh @@ -261,13 +261,14 @@ echo "Creating Clibsodium.xcframework..." rm -rf "${PREFIX}/Clibsodium.xcframework" +XCFRAMEWORK_ARGS="" for f in ios ios-simulators watchos watchos-simulators catalyst; do - echo "> ${f}" - xcodebuild -create-xcframework \ - -library "${PREFIX}/${f}/lib/libsodium.a" \ - -headers "${PREFIX}/${f}/include" \ - -output "${PREFIX}/Clibsodium.xcframework" >/dev/null + XCFRAMEWORK_ARGS="${XCFRAMEWORK_ARGS} -library ${PREFIX}/${f}/lib/libsodium.a" + XCFRAMEWORK_ARGS="${XCFRAMEWORK_ARGS} -headers ${PREFIX}/${f}/include" done +xcodebuild -create-xcframework \ + ${XCFRAMEWORK_ARGS} \ + -output "${PREFIX}/Clibsodium.xcframework" >/dev/null ls -ld -- "$PREFIX" ls -l -- "$PREFIX"