llvmPackages: add support for native FreeBSD#311777
llvmPackages: add support for native FreeBSD#311777Ericson2314 merged 2 commits intoNixOS:stagingfrom
Conversation
There was a problem hiding this comment.
Not opposed to this, just curious: what required this?
EDIT: sorry, missed your comment about bootstrap (though I don't see this option used in #296581...)
Do we want to also gate the ncurses dep on this option? It's currently disabled only for cross:
https://github.com/NixOS/nixpkgs/blob/e58c6b2579f01721118025823a14379c87e00eda/pkgs/development/compilers/llvm/common/llvm/default.nix#L121
There was a problem hiding this comment.
By plunging into the icy depths of the commit history from several branches ago, I was able to determine this was added while I was trying to get a bunch of things to compile cross-static for the bootstrap files. Sounds like I couldn't get a staticlib out of terminfo.
There was a problem hiding this comment.
Can you mention this in the commit message?
There was a problem hiding this comment.
Done. I was also able to clarify some of the other parts of the commit message.
There was a problem hiding this comment.
Can we do lib.cmakeBool for this if it is going to staging? Though I am not at all sure we need to go to staging.
There was a problem hiding this comment.
Oh I didn't see that, haha. But why is it the case? The code looks pretty innocent.
There was a problem hiding this comment.
https://github.com/NixOS/nixpkgs/pull/311777/files#diff-ce640f96a649fa4a9dd17247b89883c49921ef7e013fb8ca31bafc65e03d298fL145 adds to a comment in a darwin-gated shell script
There was a problem hiding this comment.
Oh. Let's just add a comment outside the script in Nix code then. And next staging we should move the rest of the comment outside too so we don't get this problem again.
There was a problem hiding this comment.
Why would it even matter if it went through staging? There's no binary cache for FreeBSD anyway.
There was a problem hiding this comment.
@alyssais Good point. But I guess it's still nice to quickly test that cross still works etc. too so that can help.
pkgs/development/compilers/llvm/16/compiler-rt/freebsd-i386.patch
Outdated
Show resolved
Hide resolved
a718ea3 to
0a693be
Compare
|
I integrated the above discussion into a comment in common/llvm/default.nix. I think things have been addressed at this point, so I'm open to new reviews. |
3d49478 to
dc6f078
Compare
* asan doesn't work quite right, disable it * support for 32-bit FreeBSD uses by default logic tuned for a very old FreeBSD; fix that * Some llvm tests fail for the same reason as MacOS; disable them * libcxx no longer needs a FreeBSD special case * Add an option to conditionally disable terminfo. terminfo doesn't seem to cross-compile static for FreeBSD, which means that it needs to be disabled when building the very early FreeBSD bootstrap tools. Co-authored-by: John Ericson <git@JohnEricson.me>
dc6f078 to
e49098e
Compare
|
well... with the new cmakeBool we are now mass-rebuilding linux too. Might as well just get the comment movement done now. |
This is being done now because a mass rebuild is eminent anyway.
Description of changes
part of #296581
Tests were done with llvmPackages_16
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.