[5.9] Don't build and install libcxx when generating a macOS toolchain #64689
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Libcxx is already part of the macOS SDKs shipped since Xcode 12.5, so there is no need for us to rebuild it. This will also prevent compilation issues in the presets that builds the standard library using a prebuilt toolchain, so the clang compiler that ships in that toolchain does not pickup libcxx headers that do not match the tbd shipped in the underlying macOS SDK. This change would be desirable for all macOS presets, focusing for now on the toolchain presets. Addresses rdar://106817494 (cherry picked from commit 310082b, swiftlang#64687)
|
@swift-ci please test |
|
@swift-ci please build toolchain |
|
This makes sense to me in principle. We recommend not trying to build libc++ on Apple platforms and using the system/SDK provided one unless you are trying to bootstrap a SDK or C++ toolchain yourself, which isn’t the case here. It’s basically like libc — we don’t build libc from scratch, we use the one from the system. So this LGTM, however I am not familiar with the Swift setup so my review of the changes themselves has limited value. |
drexin
approved these changes
Mar 29, 2023
tbkka
approved these changes
Mar 29, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Libcxx is already part of the macOS SDKs shipped since Xcode 12.5, so there is no need for us to rebuild it.
This will also prevent compilation issues in the presets that builds the standard library using a prebuilt toolchain, so the clang compiler that ships in that toolchain does not pickup libcxx headers that do not match the tbd shipped in the underlying macOS SDK.
This change would be desirable for all macOS presets, focusing for now on the toolchain presets.
Addresses rdar://106817494
(cherry picked from commit 310082b, #64687)