From b98653c32f602b29738fcf6813400a39b8816711 Mon Sep 17 00:00:00 2001 From: sneurlax Date: Fri, 12 Apr 2024 13:43:14 -0500 Subject: [PATCH] iOS build: do not fail due to mv: Directory not empty --- external/ios/build_boost.sh | 4 ++-- external/ios/build_openssl.sh | 2 +- external/ios/build_sodium.sh | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/external/ios/build_boost.sh b/external/ios/build_boost.sh index acef5c7..3d340da 100755 --- a/external/ios/build_boost.sh +++ b/external/ios/build_boost.sh @@ -38,5 +38,5 @@ fi --boost-version ${BOOST_VERSION} \ --no-framework -mv ${BOOST_DIR_PATH}/build/boost/${BOOST_VERSION}/ios/release/prefix/include/* $EXTERNAL_IOS_INCLUDE_DIR -mv ${BOOST_DIR_PATH}/build/boost/${BOOST_VERSION}/ios/release/prefix/lib/* $EXTERNAL_IOS_LIB_DIR \ No newline at end of file +mv -f -n ${BOOST_DIR_PATH}/build/boost/${BOOST_VERSION}/ios/release/prefix/include/* $EXTERNAL_IOS_INCLUDE_DIR +mv -f -n ${BOOST_DIR_PATH}/build/boost/${BOOST_VERSION}/ios/release/prefix/lib/* $EXTERNAL_IOS_LIB_DIR \ No newline at end of file diff --git a/external/ios/build_openssl.sh b/external/ios/build_openssl.sh index fc2579e..c464355 100755 --- a/external/ios/build_openssl.sh +++ b/external/ios/build_openssl.sh @@ -30,6 +30,6 @@ fi ./build-libssl.sh --version=1.1.1q --targets="ios-cross-arm64" --deprecated -mv ${OPEN_SSL_DIR_PATH}/include/* $EXTERNAL_IOS_INCLUDE_DIR +mv -f -n ${OPEN_SSL_DIR_PATH}/include/* $EXTERNAL_IOS_INCLUDE_DIR mv ${OPEN_SSL_DIR_PATH}/lib/libcrypto-iOS.a ${EXTERNAL_IOS_LIB_DIR}/libcrypto.a mv ${OPEN_SSL_DIR_PATH}/lib/libssl-iOS.a ${EXTERNAL_IOS_LIB_DIR}/libssl.a \ No newline at end of file diff --git a/external/ios/build_sodium.sh b/external/ios/build_sodium.sh index 8d5c786..a995861 100755 --- a/external/ios/build_sodium.sh +++ b/external/ios/build_sodium.sh @@ -31,5 +31,5 @@ fi ./dist-build/apple-xcframework.sh -mv ${SODIUM_PATH}/libsodium-apple/ios/include/* $EXTERNAL_IOS_INCLUDE_DIR -mv ${SODIUM_PATH}/libsodium-apple/ios/lib/* $EXTERNAL_IOS_LIB_DIR \ No newline at end of file +mv -f -n ${SODIUM_PATH}/libsodium-apple/ios/include/* $EXTERNAL_IOS_INCLUDE_DIR +mv -f -n ${SODIUM_PATH}/libsodium-apple/ios/lib/* $EXTERNAL_IOS_LIB_DIR \ No newline at end of file