-
-
Notifications
You must be signed in to change notification settings - Fork 14.4k
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
pkgsLLVM.x264: fix build #210983
pkgsLLVM.x264: fix build #210983
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.
I guess this is o.k., but a better way to fix this, I feel like would be to make bintools wrapper link ${prefix}llvm-strings
-> ${prefix}strings
, given that it does link it in the GNU binutils case…
@@ -34,6 +34,10 @@ stdenv.mkDerivation rec { | |||
|
|||
outputs = [ "out" "lib" "dev" ]; | |||
|
|||
STRINGS = if stdenv.hostPlatform.useLLVM or false |
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.
Hm, smells like we would need a stdenv.bintools.isLLVM or false
of some kind…
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.
I guess LLVM bintools and GCC could be mixed, but would anyone actually do that? You're probably right, though, it's something that should be done for posterity if nothing else.
We were missing symlinks for some programs e.g. strings, which caused e.g. pkgsLLVM.x264 to fail to build. Here, I have filled in all the symlinks that LLVM would create if built with the LLVM_INSTALL_BINUTILS_SYMLINKS option. Where an existing symlink's target has changed, it's to avoid a double indirection e.g. strip -> llvm-strip -> llvm-objcopy has because just strip -> llvm-objcopy. There's also the related problem that we are creating a as -> llvm-as symlink, which doesn't make sense, but I'll remove that in a subsequent commit so that if it somehow breaks something it's easy to revert just that change. Fixes: NixOS#210983
Description of changes
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/
)nixos/doc/manual/md-to-db.sh
to update generated release notes