swift: fix build with the new SDK pattern #346947
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
This was referenced Oct 6, 2024
Closed
reckenrode
force-pushed
the
push-pttrpnmvytwl
branch
from
0a52694 to
01991c1
Compare
13 tasks
reckenrode
force-pushed
the
push-pttrpnmvytwl
branch
from
01991c1 to
d2848dd
Compare
github-actions
bot
added
6.topic: python
6.topic: nixos
reckenrode
force-pushed
the
reckenrode/darwin-sdk-refactor
branch
from
ee7fb7e to
183877a
Compare
10 tasks
reckenrode
force-pushed
the
reckenrode/darwin-sdk-refactor
branch
from
a240201 to
4112f1a
Compare
Swift’s build makes a few assumptions about how the SDK is set up that are not true anymore with the new SDK. Fix it to find the SDK at `$SDKROOT` and copy additional stubs it needs to bootstrap.
libarclite is needed to support ARC on very old deployment targets (10.10 and older). None of these deployment targets are supported deployment targets in nixpkgs, especially for Swift. This removes the need to package the command-line tools executables.
Swift releases are associated with particular Darwin SDK versions. They don’t _have_ to use that version, but it makes sense to use that version by default. The deployment target is set to the supported Swift minimum versions. Unlike C and C++, Swift requires you to availability annotations, so propagating a newer SDK should be safe.
reckenrode
force-pushed
the
push-pttrpnmvytwl
branch
from
8d5d373 to
849fb99
Compare
reckenrode
force-pushed
the
reckenrode/darwin-sdk-refactor
branch
from
4112f1a to
a1adff0
Compare
emilazy
reviewed
Oct 10, 2024
Comment on lines
+44
to
+48
| deploymentVersion = | ||
| if lib.versionOlder (targetPlatform.darwinMinVersion or "0") "10.15" then | ||
| "10.15" | ||
| else | ||
| targetPlatform.darwinMinVersion; |
There was a problem hiding this comment.
I think this is equivalent to deploymentVersion = "10.15";, but it’s fine (and will go away in 25.05 anyway).
There was a problem hiding this comment.
It also defaults to 10.15 when building on Linux (or should).
Comment on lines
+152
to
+154
| # Make empty to avoid adding the SDK’s modules in the bootstrap wrapper. Otherwise, the SDK conflicts with the | ||
| # shims the wrapper tries to build. | ||
| darwinMinVersion="" substituteAll '${../wrapper/wrapper.sh}' "$out" |
There was a problem hiding this comment.
I don’t really understand this.
There was a problem hiding this comment.
The wrapper uses darwinMinVersion to detect whether it is targeting Linux or Darwin. On Darwin, it will add the SDK to NIX_CFLAGS_COMPILE. Setting it to empty triggers the Linux behavior (no setting), which is what we want because the full SDK breaks the Swift bootstrap.
There was a problem hiding this comment.
I see, I guess because they expect people to be using the system Swift for bootstrap on macOS?
There was a problem hiding this comment.
Upstream uses a Python script to manage the bootstrap. I don’t know the specifics, but the nixpkgs derivation is trying to recreate what it does.
reckenrode
force-pushed
the
reckenrode/darwin-sdk-refactor
branch
from
a1adff0 to
e3f2829
Compare
These are no longer needed with the new Darwin SDK. xcbuild will automatically use the correct SDK for the stdenv.
reckenrode
force-pushed
the
push-pttrpnmvytwl
branch
from
849fb99 to
f4af7ea
Compare
reckenrode
changed the base branch from
reckenrode/darwin-sdk-refactor
to
staging
emilazy
approved these changes
Oct 11, 2024
azuwis
added a commit
to azuwis/nixpkgs
that referenced
this pull request
Oct 23, 2024
…h64-darwin - Switch to new appke SDK pattern, NixOS#346947 - Build from source for aarch64-darwin * Use llvmPackages_19 on aarch64-darwin for `ptrauth.h` support * Setup unwrapped clang to build the arm64e scripting addition - Use nix-update-script for passthru.updateScript
azuwis
added a commit
to azuwis/nixpkgs
that referenced
this pull request
Oct 23, 2024
…h64-darwin - Switch to new appke SDK pattern, NixOS#346947 - Build from source for aarch64-darwin * Use llvmPackages_19 on aarch64-darwin for `ptrauth.h` support * Setup unwrapped clang to build the arm64e scripting addition - Use nix-update-script for passthru.updateScript - Add azuwis as maintainer
azuwis
added a commit
to azuwis/nixpkgs
that referenced
this pull request
Oct 23, 2024
…h64-darwin - Switch to new appke SDK pattern, NixOS#346947 - Build from source for aarch64-darwin * Use llvmPackages_19 on aarch64-darwin for `ptrauth.h` support * Setup unwrapped clang to build the arm64e scripting addition - Use nix-update-script for passthru.updateScript - Add azuwis as maintainer
|
This pull request has been mentioned on NixOS Discourse. There might be relevant details there: https://discourse.nixos.org/t/title-the-darwin-sdks-have-been-updated/55295/1 |
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.
Swift depends on how the old SDK pattern was implemented (e.g., that only the requested framework dependencies would be available). This PR updates Swift to build in a way that’s compatible with the new pattern, uses the same SDK that Swift 5.8 expects to use, and propagates it to make sure packages using Swift have at least the right SDK version.
Things done
nix.conf? (See Nix manual)sandbox = relaxedsandbox = truenix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)Add a 👍 reaction to pull requests you find important.