-
-
Notifications
You must be signed in to change notification settings - Fork 14k
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
llvmPackages_16.compiler-rt: fix static build on Darwin #247066
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM. Thank you!
Just want to call attention to CI reporting the following failure:
|
Thanks for the head up. I’ll look into it Monday evening. |
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. |
c3c5320
to
87e85b3
Compare
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.
87e85b3
to
761aa9b
Compare
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. |
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.hello
on an aarch64-darwin machine.Things done
sandbox = true
set 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/
)