Skip to content

Commit 6a163fd

Browse files
committed
Hack in a fix for a weird failure when building 6.1/6.2 SDKs that I'm seeing on the CI lately
1 parent b284f76 commit 6a163fd

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

.github/workflows/sdks.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -167,6 +167,10 @@ jobs:
167167
168168
./swift/utils/build-script -RA --skip-build-cmark --build-llvm=0 --android --android-ndk $ANDROID_NDK_HOME --android-arch $arch --android-api-level $ANDROID_API_LEVEL --build-swift-tools=0 --native-swift-tools-path=${TOOLCHAIN}/bin --native-clang-tools-path=${TOOLCHAIN}/bin --cross-compile-hosts=android-$arch --cross-compile-deps-path=$SDK --skip-local-build --build-swift-static-stdlib --xctest --install-swift --install-libdispatch --install-foundation --install-xctest --install-destdir=$SDK --swift-install-components='compiler;clang-resource-dir-symlink;license;stdlib;sdk-overlay' --cross-compile-append-host-target-to-destdir=False -b -p --install-llbuild $LSP_BUILD $TESTING_BUILD
169169
170+
if [ ${{ matrix.version }} != 'release' ]; then
171+
rm $ANDROID_NDK_HOME/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/swift
172+
fi
173+
170174
pushd ${SDK_NAME}/usr
171175
172176
patchelf --set-rpath \$ORIGIN lib/swift/android/lib[dFXs]*.so

0 commit comments

Comments
 (0)