Skip to content

Update path to support swbuild if available #8306

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 1 commit into from
Feb 26, 2025
Merged

Update path to support swbuild if available #8306

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 13 additions & 4 deletions Sources/XCBuildSupport/XcodeBuildSystem.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,10 +100,19 @@ public final class XcodeBuildSystem: SPMBuildCore.BuildSystem {
} else {
let xcodeSelectOutput = try AsyncProcess.popen(args: "xcode-select", "-p").utf8Output().spm_chomp()
let xcodeDirectory = try AbsolutePath(validating: xcodeSelectOutput)
xcbuildPath = try AbsolutePath(
validating: "../SharedFrameworks/XCBuild.framework/Versions/A/Support/xcbuild",
relativeTo: xcodeDirectory
)
xcbuildPath = try {
let newPath = try AbsolutePath(
validating: "../SharedFrameworks/SwiftBuild.framework/Versions/A/Support/swbuild",
relativeTo: xcodeDirectory
)
if fileSystem.exists(newPath) {
return newPath
}
return try AbsolutePath(
validating: "../SharedFrameworks/XCBuild.framework/Versions/A/Support/xcbuild",
relativeTo: xcodeDirectory
)
}()
}

guard fileSystem.exists(xcbuildPath) else {
Expand Down