Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Swift 5.10 #23

Merged
merged 3 commits into from
Mar 21, 2024
Merged

Swift 5.10 #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4f48027
Swift: this patch was upstreamed
Mar 19, 2024
ca25dc3
Swift: remove unsupported argument
Mar 19, 2024
b3495a5
Fix CMake setup
Mar 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}")
Expand All @@ -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)

Expand Down
15 changes: 0 additions & 15 deletions patches/swift/expose-swift-version.patch
View file
Open in desktop

This file was deleted.

3 changes: 1 addition & 2 deletions pkg_swift_llvm.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 0 additions & 1 deletion swift-build-presets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down