llvmPackages_16.compiler-rt: fix static build on Darwin#247066
Merged
tjni merged 1 commit intoNixOS:masterfrom Aug 22, 2023
Merged
llvmPackages_16.compiler-rt: fix static build on Darwin#247066tjni merged 1 commit intoNixOS:masterfrom
tjni merged 1 commit intoNixOS:masterfrom
Conversation
reckenrode
changed the title
This was referenced Aug 2, 2023
12 tasks
ofborg
bot
requested review from
Ericson2314,
alyssais,
dtzWill,
lovek323,
primeos,
rrbutani and
sternenseemann
ofborg
bot
added
10.rebuild-darwin: 11-100
figsoda
added
the
12.approvals: 1
Contributor
|
Just want to call attention to CI reporting the following failure: |
Contributor
Author
Thanks for the head up. I’ll look into it Monday evening. |
Contributor
Author
|
My guess is it’s failing without the clang 16 stdenv. I probably need to copy whatever logic I’m using there to make sure the sanitizers can still build. |
reckenrode
force-pushed
the
compiler-rt-static
branch
2 times, most recently
from
c3c5320 to
87e85b3
Compare
Contributor
Author
|
I simplified the patch. I confirmed that pkgsStatic.hello builds with the clang 16 stdenv and llvmPackages_16.compiler-rt builds with both the clang 11 and clang 16 stdenvs. |
This fixes two issues on Darwin to allow pkgsStatic to work with LLVM 16 * It fixes an infinite recursion where Darwin was using a regular stdenv to build compiler-rt instead of one without compiler-rt; and * It disables sanitizers that won’t build statically and makes sure the build can find the cross-lipo.
reckenrode
force-pushed
the
compiler-rt-static
branch
from
87e85b3 to
761aa9b
Compare
Contributor
Author
|
As a follow up once this is merged, I can port this to llvmPackages_git and possibly the other ones (12–15) as well for consistency. I don’t want the scope of this one to creep up since it is blocking #241692. |
tjni
approved these changes
Aug 22, 2023
rrbutani
added
the
6.topic: llvm/clang
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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
This fixes two issues on Darwin to allow pkgsStatic to work with LLVM 16
This should fix the evaluation error blocking #241692.
Testing was done by cherry-picking #241692 and running
nix build .#pkgsStatic.helloon an aarch64-darwin machine.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/)