Adjust trunk SPM patch, use clang from prebuilt Swift toolchain to build SPM, and stop building swift-syntax on CI

Author: finagolfin

.github/workflows/sdks.yml

@@ -114,11 +114,12 @@ jobs:
 
           if [ ${{ matrix.version }} = 'trunk' ]; then
             git apply package-patches/swiftpm-sqlite.patch
+            BUILD_TRUNK_FLAG="--skip-early-swiftsyntax"
           else
             git apply swift-android-clang.patch
           fi
 
-          ./swift/utils/build-script -RA --skip-build-cmark --build-llvm=0 --android --android-ndk $ANDROID_NDK --android-arch ${{ matrix.arch }} --android-api-level $ANDROID_API_LEVEL --build-swift-tools=0 --native-swift-tools-path=`pwd`/$SWIFT_TAG-ubuntu20.04/usr/bin --native-clang-tools-path=`pwd`/$SWIFT_TAG-ubuntu20.04/usr/bin --cross-compile-hosts=android-${{ matrix.arch }} --cross-compile-deps-path=$SDK --skip-local-build --build-swift-static-stdlib --xctest --skip-early-swift-driver --install-swift --install-libdispatch --install-foundation --install-xctest --install-destdir=$SDK --swift-install-components='clang-resource-dir-symlink;license;stdlib;sdk-overlay' --cross-compile-append-host-target-to-destdir=False -b -p --install-llbuild --sourcekit-lsp
+          ./swift/utils/build-script -RA --skip-build-cmark --build-llvm=0 --android --android-ndk $ANDROID_NDK --android-arch ${{ matrix.arch }} --android-api-level $ANDROID_API_LEVEL --build-swift-tools=0 --native-swift-tools-path=`pwd`/$SWIFT_TAG-ubuntu20.04/usr/bin --native-clang-tools-path=`pwd`/$SWIFT_TAG-ubuntu20.04/usr/bin --cross-compile-hosts=android-${{ matrix.arch }} --cross-compile-deps-path=$SDK --skip-local-build --build-swift-static-stdlib --xctest --skip-early-swift-driver --install-swift --install-libdispatch --install-foundation --install-xctest --install-destdir=$SDK --swift-install-components='clang-resource-dir-symlink;license;stdlib;sdk-overlay' --cross-compile-append-host-target-to-destdir=False -b -p --install-llbuild --sourcekit-lsp $BUILD_TRUNK_FLAG
 
           cp $ANDROID_NDK/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/$(echo ${{ matrix.arch }} | sed "s/v7//")-linux-android*/libc++_shared.so $SDK/usr/lib
           patchelf --set-rpath \$ORIGIN $SDK/usr/lib/swift/android/libdispatch.so

package-patches/swiftpm-sqlite.patch

@@ -12,12 +12,25 @@ index 17ad9e3..953fffd 100755
      return env
 
 
+diff --git a/swift/utils/swift_build_support/swift_build_support/products/swiftpm.py b/swift/utils/swift_build_support/swift_build_support/products/swiftpm.py
+index 42a2ff914b4..3ea91589a57 100644
+--- a/swift/utils/swift_build_support/swift_build_support/products/swiftpm.py
++++ b/swift/utils/swift_build_support/swift_build_support/products/swiftpm.py
+@@ -67,7 +67,7 @@ class SwiftPM(product.Product):
+ 
+         helper_cmd += [
+             "--swiftc-path", swiftc,
+-            "--clang-path", self.toolchain.cc,
++            "--clang-path", os.path.join(toolchain_path, "bin", "clang"),
+             "--cmake-path", self.toolchain.cmake,
+             "--ninja-path", self.toolchain.ninja,
+             "--build-dir", self.build_dir,
 diff --git a/swiftpm/Utilities/bootstrap b/swiftpm/Utilities/bootstrap
 index 085056de..1ded1a90 100755
 --- a/swiftpm/Utilities/bootstrap
 +++ b/swiftpm/Utilities/bootstrap
 @@ -615,6 +615,9 @@
-         "SWIFT_DRIVER_SWIFT_EXEC=" + args.swiftc_path,
+         "CC=" + args.clang_path
      ]
 
 +    if args.cross_compile_hosts and re.match('android-', args.cross_compile_hosts):