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

Jump to bottom
Merged
merged 3 commits into from
Apr 16, 2025
Merged

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

merged 3 commits into from
Apr 16, 2025

Conversation

cmcgee1024
Copy link
Member

@cmcgee1024 cmcgee1024 commented Apr 11, 2025 •
edited
Loading

Fixes #312

@cmcgee1024
Copy link
Member Author

@swift-ci test macOS

@cmcgee1024 cmcgee1024 added the release candidate This issue is a candidate for the next release label Apr 14, 2025
@cmcgee1024
Copy link
Member Author

@swift-ci test macOS

@cmcgee1024
Copy link
Member Author

@swift-ci test macOS

@0xTim
Copy link
Member

0xTim commented Apr 15, 2025

What happens if the user doesn't have xcrun installed? (This has come up for me on a fresh install of macOS, will create a separate issue)

@cmcgee1024
Copy link
Member Author

What happens if the user doesn't have xcrun installed? (This has come up for me on a fresh install of macOS, will create a separate issue)

In this patch, the command will fail to run, and then the SDKROOT environment variable will remain nil (unset), so I expect that the behaviour will be the same as it was before.

Swiftly and the swift toolchain will generally require at least the command line tools, with the macOS SDK to be installed or else nothing Swift related will work. With the CLT installed, the xcrun should be available, and then this fix picks that up.

@0xTim
Copy link
Member

0xTim commented Apr 16, 2025

Opened as #322 - if the CLT are required, Swiftly should install them if they're not available

@cmcgee1024 cmcgee1024 merged commit 7635eea into swiftlang:main Apr 16, 2025
22 checks passed
cmcgee1024 added a commit to cmcgee1024/swiftly that referenced this pull request Apr 16, 2025
@cmcgee1024
Add SDKROOT when proxying on macOS based on xcrun information (swiftl…
29e43c4 
…ang#316)

* Strip newlines from xcrun output
@cmcgee1024 cmcgee1024 mentioned this pull request Apr 16, 2025
Merged
cmcgee1024 added a commit that referenced this pull request Apr 16, 2025
@cmcgee1024
Add SDKROOT when proxying on macOS based on xcrun information (#325)
92515c9 
Add SDKROOT when proxying on macOS based on xcrun information (#316)

* Strip newlines from xcrun output
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@plemarquand plemarquand plemarquand approved these changes

@justice-adams-apple justice-adams-apple justice-adams-apple approved these changes

Assignees
No one assigned
Labels
release candidate This issue is a candidate for the next release
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Cannot compile C++ with clang++ when swiftly is installed
4 participants
@cmcgee1024 @0xTim @plemarquand @justice-adams-apple