swift: use stdenv libc++ on Darwin #245641
Merged
Conversation
This file contains 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
ofborg
bot
added
10.rebuild-darwin: 11-100
10.rebuild-linux: 0
|
Result of 6 packages marked as broken and skipped:
9 packages failed to build:
36 packages built:
|
|
Result of 3 packages marked as broken and skipped:
4 packages failed to build:
18 packages built:
|
|
tjni
reviewed
Aug 4, 2023
Comment on lines
32
to
46
| llvmPackages_15.clang.override rec { | ||
| libc = apple_sdk.Libsystem; | ||
| bintools = pkgs.bintools.override { inherit libc; }; | ||
| # Ensure that Swift’s internal clang is using the same libc++ and libc++abi | ||
| # used by the default Darwin stdenv. | ||
| libcxx = pkgs.llvmPackages.libcxx; | ||
| extraPackages = [ | ||
| pkgs.llvmPackages.libcxxabi | ||
| (pkgs.llvmPackages_15.compiler-rt.override { | ||
| inherit (pkgs.llvmPackages) libcxxabi; | ||
| }) | ||
| ]; | ||
| } |
There was a problem hiding this comment.
Now that llvmPackages_15 is repeated twice, can we turn this into a function, something like:
if pkgs.stdenv.isDarwin then
# Comments here
let makeSwiftClang = stdenvLLVM: targetLLVM:
...
in
makeSwiftClang pkgs.llvmPackages llvmPackages_15
There was a problem hiding this comment.
How’s the current push look like with the alias (swiftLlvmPackages)? I can still rework it to use a function, but it’s only going to be used right away, so it seems like it would add a limited amount of clarity.
reckenrode
force-pushed
the
swift-libc++
branch
2 times, most recently
from
3c58bda to
3595e01
Compare
reckenrode
force-pushed
the
swift-libc++
branch
from
3595e01 to
8b124ad
Compare
Swift uses libc++ 15, but it should really be using the same libc++ from the stdenv. While not strictly needed currently, Swift 5.9 will support C++ interop. If Swift is not using the stdenv C++, any C++ library used with interop would need to be rebuilt against the Swift libc++.
reckenrode
force-pushed
the
swift-libc++
branch
from
8b124ad to
efdf4e9
Compare
tjni
approved these changes
Aug 5, 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.
Description of changes
Swift uses libc++ 15, but it should really be using the same libc++ from the stdenv. While not strictly needed currently, Swift 5.9 will support C++ interop. If Swift is not using the stdenv C++, any C++ library used with interop would need to be rebuilt against the Swift libc++.
Things done
sandbox = trueset innix.conf? (See Nix manual)nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)