Merge pull request #23 from dsp-testing/alexdenisov/swift-5.10

Swift 5.10

Author: AlexDenisov

CMakeLists.txt

@@ -6,6 +6,9 @@ find_package(Clang REQUIRED CONFIG)
 find_package(Swift REQUIRED CONFIG)
 find_package(SwiftSyntax REQUIRED CONFIG)
 
+set(THREADS_PREFER_PTHREAD_FLAG YES)
+include(FindThreads)
+
 message("Using LLVM_CONFIG: ${Swift_CONFIG}")
 message("Using Clang_CONFIG: ${LLVM_CONFIG}")
 message("Using Swift_CONFIG: ${Clang_CONFIG}")
@@ -17,6 +20,7 @@ set (CODEQL_SWIFT_VERSION_MAJOR ${SWIFT_VERSION_MAJOR})
 set (CODEQL_SWIFT_VERSION_MINOR ${SWIFT_VERSION_MINOR})
 set (CODEQL_SWIFT_VERSION_PATCH ${SWIFT_VERSION_PATCH})
 
+# TODO: these are now upstreamed
 configure_file(${CMAKE_SOURCE_DIR}/CodeQLSwiftVersion.h.in
                ${SWIFT_BINARY_DIR}/include/swift/CodeQLSwiftVersion.h)
 

patches/swift/expose-swift-version.patch

@@ -173,9 +173,8 @@ def main(opts):
     os.mkdir(tmp)
     llvm_build_tree = next(opts.build_tree.glob("llvm-*"))
     swift_build_tree = next(opts.build_tree.glob("swift-*"))
-    earlyswiftsyntax_build_tree = next(opts.build_tree.glob("earlyswiftsyntax-*"))
     configured = configure_dummy_project(tmp, prefixes=[llvm_build_tree, swift_build_tree,
-                                                        earlyswiftsyntax_build_tree / "cmake" / "modules"])
+                                                        swift_build_tree / 'cmake' / 'modules'])
     libs = get_libs(configured)
 
     exported = tmp / "exported"

pkg_swift_llvm.py

@@ -11,7 +11,6 @@ skip-test-sourcekit-lsp
 skip-test-playgroundsupport
 skip-test-skstresstester
 skip-test-swiftformat
-skip-test-swiftevolve
 skip-test-toolchain-benchmarks
 skip-test-swift-inspect
 skip-test-swift