From 882f1be006d0d1420178fffb5f7638ed06187f44 Mon Sep 17 00:00:00 2001 From: Frank Denis Date: Thu, 6 Aug 2020 15:46:52 +0200 Subject: [PATCH] Bring Catalyst support back, properly forcing cross-compilation --- dist-build/apple-xcframework.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dist-build/apple-xcframework.sh b/dist-build/apple-xcframework.sh index f267230a..731c6f4e 100755 --- a/dist-build/apple-xcframework.sh +++ b/dist-build/apple-xcframework.sh @@ -182,21 +182,21 @@ build_catalyst() { ## 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}" + export CFLAGS="-O2 -arch arm64 -target arm64-apple-ios13.0-macabi -isysroot ${SDK}" + export LDFLAGS="-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" \ + ./configure --host=arm-apple-ios --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}" + export CFLAGS="-O2 -arch x86_64 -target x86_64-apple-ios13.0-macabi -isysroot ${SDK}" + export LDFLAGS="-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" \ + ./configure --host=x86_64-apple-ios --prefix="$CATALYST_X86_64_PREFIX" \ ${LIBSODIUM_ENABLE_MINIMAL_FLAG} || exit 1 make -j${PROCESSORS} install || exit 1 }