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)
 

pkg_swift_llvm.py

@@ -80,7 +80,7 @@ def get_libs(configured):
             ret.static.append((configured / l).absolute())
         elif l.endswith(".so") or l.endswith(".tbd") or l.endswith(".dylib"):
             ret.shared.append((configured / l).absolute())
-        elif l.startswith(("-L", "-Wl", "-l")):
+        elif l.startswith(("-L", "-Wl", "-l")) or l == "-pthread":
             ret.linker_flags.append(l)
         else:
             raise ValueError(f"cannot understand link.txt: " + l)
@@ -119,23 +119,6 @@ def copy_includes(src, tgt):
                 tgtfile.parent.mkdir(parents=True, exist_ok=True)
                 shutil.copy(srcfile, tgtfile)
 
-
-def export_sdk(tgt, swift_source_tree, swift_build_tree):
-    print("assembling sdk")
-    srcdir = swift_build_tree / "lib" / "swift"
-    tgtdir = tgt / "usr" / "lib" / "swift"
-    if get_platform() == "linux":
-        srcdir /= "linux"
-        tgtdir /= "linux/x86_64"
-    else:
-        srcdir /= "macosx"
-    for mod in srcdir.glob("*.swiftmodule"):
-        shutil.copytree(mod, tgtdir / mod.name)
-    shutil.copytree(swift_source_tree / "stdlib" / "public" / "SwiftShims" / "swift" / "shims",
-                    tgt / "usr" / "lib" / "swift" / "shims",
-                    ignore=shutil.ignore_patterns('CMakeLists.txt'))
-
-
 def export_stdlibs(exported_dir, swift_build_tree):
     ext = 'dylib'
     platform = 'linux' if get_platform() == 'linux' else 'macosx'
@@ -190,16 +173,14 @@ 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"
     exported.mkdir()
     export_libs(exported, libs, swift_build_tree)
     export_headers(exported, opts.swift_source_tree, llvm_build_tree, swift_build_tree)
-    export_sdk(exported / "sdk", opts.swift_source_tree, swift_build_tree)
 
     zip_dir(exported, opts.output)
 

swift-build-presets

@@ -11,10 +11,13 @@ 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
+skip-build-xros
+skip-test-xros
+skip-test-xros-host
+skip-test-xros-simulator
 
 skip-build-clang-tools-extra
 skip-build-benchmarks
@@ -26,8 +29,14 @@ no-assertions
 reconfigure
 
 install-swift
+install-swiftsyntax
+install-swift-testing
+install-swift-testing-macros
 install-prefix=/codeql-toolchain
 
+swift-testing
+swift-testing-macros
+
 [preset: codeql-release]
 mixin-preset=codeql-baseline
 release
@@ -39,10 +48,6 @@ bootstrapping=hosttools
 
 [preset: codeql-macOS]
 mixin-preset=codeql-release
-ios
-tvos
-watchos
-maccatalyst
 bootstrapping=bootstrapping
 
 [preset: codeql-debug]