Dev: replace stdlib foundation in swift toolchain

readdle · Dec 22, 2024 · acb695f · acb695f
1 parent d64119e
commit acb695f
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/.github/workflows/build-android-toolchain.yml b/.github/workflows/build-android-toolchain.yml
@@ -337,8 +337,10 @@ jobs:
       with:
         name: swift-android-arm64-v8a
         path: ~/swift-android/lib
-    - name: Copy andorid stdlibs to swift toolchain
+    - name: Copy andorid stdlib to swift toolchain
       run: cp -r ~/swift-android/lib/swift/android ~/swift-toolchain/usr/lib/swift
+    - name: Remove corelibs headers from swift-toolchain
+      run: rm -rf ~/swift-toolchain/usr/lib/swift/CoreFoundation ~/swift-toolchain/usr/lib/swift/dispatch ~/swift-toolchain/usr/lib/swift/_FoundationCShims ~/swift-toolchain/usr/lib/swift/_foundation_unicode
     - name: Clone Swift
       run: ./build/Linux/020-clone-swift.sh
     - name: Build Corelibs
@@ -385,8 +387,10 @@ jobs:
       with:
         name: swift-android-armeabi-v7a
         path: ~/swift-android/lib
-    - name: Copy andorid stdlibs to swift toolchain
+    - name: Copy andorid stdlib to swift toolchain
       run: cp -r ~/swift-android/lib/swift/android ~/swift-toolchain/usr/lib/swift
+    - name: Remove corelibs headers from swift-toolchain
+      run: rm -rf ~/swift-toolchain/usr/lib/swift/CoreFoundation ~/swift-toolchain/usr/lib/swift/dispatch ~/swift-toolchain/usr/lib/swift/_FoundationCShims ~/swift-toolchain/usr/lib/swift/_foundation_unicode
     - name: Clone Swift
       run: ./build/Linux/020-clone-swift.sh
     - name: Build Corelibs
@@ -429,8 +433,10 @@ jobs:
       with:
         name: swift-android-x86_64
         path: ~/swift-android/lib
-    - name: Copy andorid stdlibs to swift toolchain
+    - name: Copy andorid stdlib to swift toolchain
       run: cp -r ~/swift-android/lib/swift/android ~/swift-toolchain/usr/lib/swift
+    - name: Remove corelibs headers from swift-toolchain
+      run: rm -rf ~/swift-toolchain/usr/lib/swift/CoreFoundation ~/swift-toolchain/usr/lib/swift/dispatch ~/swift-toolchain/usr/lib/swift/_FoundationCShims ~/swift-toolchain/usr/lib/swift/_foundation_unicode
     - name: Clone Swift
       run: ./build/Linux/020-clone-swift.sh
     - name: Build Corelibs