Skip to content

Use libcxx from Darwin SDKs when building LLVM and Swift (LLVM product) #62159

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.

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

Conversation

edymtt
Copy link
Contributor

@edymtt edymtt commented Nov 17, 2022

Those are present since Xcode 12.5, so we don't need to copy them
anymore from the toolchain

In this scenario, clean up any existing symlink in incremental builds to
avoid masking or causing errors in the future.

Took the chance to extract this logic to a different function in an attempt to improve readability

To ease review, the PR has two commits -- the first to extract the logic as is (showing that I did not alter the existing logic) and the second one to change its behaviour for Darwin (and address a minor issue when printing about the creation of symlinks)

Addresses rdar://102387542

... function

This is done in anticipation of switching to use  headers from the SDKs
for Darwin, so to not grow any further the `build` method.
Those are present since Xcode 12.5, so we don't need to copy them
anymore from the toolchain

In this scenario, clean up any existing symlink in incremental builds to
avoid masking or causing errors in the future.

Addresses rdar://102387542
@edymtt
Copy link
Contributor Author

edymtt commented Nov 17, 2022

Waiting a bit before starting testing to see if #62139 gets merged first

@edymtt
Copy link
Contributor Author

edymtt commented Nov 17, 2022

@swift-ci please test

@edymtt
Copy link
Contributor Author

edymtt commented Nov 17, 2022

@swift-ci please test Apple Silicon

@edymtt
Copy link
Contributor Author

edymtt commented Nov 17, 2022

@swift-ci please build toolchain

Copy link
Contributor

@drexin drexin left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@edymtt
Copy link
Contributor Author

edymtt commented Nov 17, 2022

@swift-ci please build toolchain macOS

@edymtt
Copy link
Contributor Author

edymtt commented Nov 18, 2022

The macOS toolchain failure is happening in the nightly job as well (https://ci.swift.org/job/oss-swift-package-macos/1239/)
and it should be addressed by #62171

@edymtt
Copy link
Contributor Author

edymtt commented Nov 18, 2022

@swift-ci please build toolchain macOS

@edymtt edymtt merged commit 38a10bb into swiftlang:main Nov 28, 2022
@edymtt edymtt deleted the use-libcxx-from-darwin-sdks-llvm-product branch December 9, 2022 15:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants