Skip to content

Commit c7c4798

Browse files
marcpruxfinagolfin
authored andcommitted
Wildcard the clang version link in the post-install script in order to accomodate NDK 27 and 28
1 parent e920cb0 commit c7c4798

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

swift-ci/sdks/android/scripts/build.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -606,7 +606,8 @@ else
606606
fi
607607
608608
# link the NDK's clang resource directory
609-
ln -sf ${ndk_prebuilt}/*/lib/clang/18 ${swift_resources}/usr/lib/swift/clang
609+
# e.g., ~/Library/Android/sdk/ndk/27.0.12077973/toolchains/llvm/prebuilt/darwin-x86_64/lib/clang/18 or /opt/homebrew/share/android-ndk/toolchains/llvm/prebuilt/darwin-x86_64/lib/clang/19
610+
ln -sf ${ndk_prebuilt}/*/lib/clang/* ${swift_resources}/usr/lib/swift/clang
610611
611612
# copy each architecture's swiftrt.o into the sysroot,
612613
# working around https://github.com/swiftlang/swift/pull/79621

0 commit comments

Comments
 (0)