From 274ae6be2e3e4c80669cb0b64b714983ddd0e6c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8rgen=20Edelbo?= Date: Mon, 26 Aug 2024 12:47:51 +0200 Subject: [PATCH] Update toolchain files --- tools/build-android.sh | 3 +-- tools/build-cocoa.sh | 5 ----- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/tools/build-android.sh b/tools/build-android.sh index 16fabedabc3..8dd9604f51f 100755 --- a/tools/build-android.sh +++ b/tools/build-android.sh @@ -46,10 +46,9 @@ for bt in "${BUILD_TYPES[@]}"; do [[ "$bt" = "Release" ]] && suffix="" || suffix="-dbg" for p in "${PLATFORMS[@]}"; do filename=$(find "build-android-${p}-${bt}" -maxdepth 1 -type f -name "realm-core-*-devel.tar.gz") - tar -C core-android -zxvf "${filename}" "lib/librealm${suffix}.a" "lib/librealm-parser${suffix}.a" "lib/librealm-sync${suffix}.a" + tar -C core-android -zxvf "${filename}" "lib/librealm${suffix}.a" "lib/librealm-parser${suffix}.a" mv "core-android/lib/librealm${suffix}.a" "core-android/librealm-android-${p}${suffix}.a" mv "core-android/lib/librealm-parser${suffix}.a" "core-android/librealm-parser-android-${p}${suffix}.a" - mv "core-android/lib/librealm-sync${suffix}.a" "core-android/librealm-sync-android-${p}${suffix}.a" rm -rf core-android/lib done done diff --git a/tools/build-cocoa.sh b/tools/build-cocoa.sh index 8e020ee6b1b..9c12599efbf 100755 --- a/tools/build-cocoa.sh +++ b/tools/build-cocoa.sh @@ -93,9 +93,6 @@ for bt in "${BUILD_TYPES[@]}"; do # core binary tar -C core -zxvf "${filename}" "lib/librealm${suffix}.a" mv "core/lib/librealm${suffix}.a" "core/librealm-${platform}${suffix}.a" - # sync binary - tar -C core -zxvf "${filename}" "lib/librealm-sync${suffix}.a" - mv "core/lib/librealm-sync${suffix}.a" "core/librealm-sync-${platform}${suffix}.a" # object store binary tar -C core -zxvf "${filename}" "lib/librealm-object-store${suffix}.a" mv "core/lib/librealm-object-store${suffix}.a" "core/librealm-object-store-${platform}${suffix}.a" @@ -104,12 +101,10 @@ for bt in "${BUILD_TYPES[@]}"; do # Merge the core, sync & object store libraries together libtool -static -o core/librealm-monorepo-${platform}${suffix}.a \ core/librealm-${platform}${suffix}.a \ - core/librealm-sync-${platform}${suffix}.a \ core/librealm-object-store-${platform}${suffix}.a # remove the now merged libraries rm -f core/librealm-${platform}${suffix}.a \ - core/librealm-sync-${platform}${suffix}.a \ core/librealm-object-store-${platform}${suffix}.a done done