Skip to content

SwiftDriverExecution: add explicit dependency on libllbuild #1957

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

Merged
merged 3 commits into from
Jul 14, 2025
Merged

SwiftDriverExecution: add explicit dependency on libllbuild #1957

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
1c0c220
SwiftDriverExecution: add explicit dependency on libllbuild
compnerd Jul 10, 2025
8edee63
SwiftDriverExecution: share the import across both sides
compnerd Jul 11, 2025
92db03a
build: correct the llbuild build when vendored
compnerd Jul 11, 2025
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
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ if(NOT LLBuild_FOUND)
find_package(LLBuild REQUIRED)
else()
message("-- Vending swift-llbuild")
set(LLBUILD_SUPPORT_BINDINGS Swift)
set(LLBUILD_SUPPORT_BINDINGS Swift CACHE STRING "")
FetchContent_Declare(LLBuild
GIT_REPOSITORY https://github.com/apple/swift-llbuild
GIT_TAG main)
Expand Down
1 change: 1 addition & 0 deletions Sources/SwiftDriverExecution/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ target_link_libraries(SwiftDriverExecution PUBLIC
SwiftOptions
SwiftDriver)
target_link_libraries(SwiftDriverExecution PRIVATE
libllbuild
llbuildSwift)

set_property(GLOBAL APPEND PROPERTY SWIFTDRIVER_EXPORTS SwiftDriverExecution)
Expand Down
4 changes: 1 addition & 3 deletions Sources/SwiftDriverExecution/llbuild.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,8 @@ import protocol TSCBasic.FileSystem
// We either import the llbuildSwift shared library or the llbuild framework.
#if canImport(llbuildSwift)
@_implementationOnly import llbuildSwift
@_implementationOnly import llbuild
#else
@_implementationOnly import llbuild
#endif
@_implementationOnly import llbuild

/// An llbuild value.
protocol LLBuildValue: Codable {
Expand Down