Skip to content

Add SDKROOT when proxying on macOS based on xcrun information #316

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
Apr 16, 2025
Merged

Add SDKROOT when proxying on macOS based on xcrun information #316

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
87cbd1e
Add SDKROOT when proxying on macOS based on xcrun information
cmcgee1024 Apr 11, 2025
c650821
Merge branch 'main' of https://github.com/swiftlang/swiftly into set_…
cmcgee1024 Apr 14, 2025
85c6ac9
Strip newlines from xcrun output
cmcgee1024 Apr 15, 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
9 changes: 9 additions & 0 deletions Sources/SwiftlyCore/Platform.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,6 +210,15 @@ extension Platform {
newEnv[key] = value
}

#if os(macOS)
// On macOS, we try to set SDKROOT if its empty for tools like clang++ that need it to
// find standard libraries that aren't in the toolchain, like libc++. Here we
// use xcrun to tell us what the default sdk root should be.
if newEnv["SDKROOT"] == nil {
newEnv["SDKROOT"] = (try? await self.runProgramOutput("/usr/bin/xcrun", "--show-sdk-path"))?.replacingOccurrences(of: "\n", with: "")
}
#endif

try self.runProgram([commandToRun] + arguments, env: newEnv)
}

Expand Down