Skip to content

rustc: use targetPlatform to detect pkgsLLVM, unbreak with LLVM and musl #379632

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.

Sign up for GitHub

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

Draft
getchoo wants to merge 4 commits into
base: master
Choose a base branch
from
Draft

rustc: use targetPlatform to detect pkgsLLVM, unbreak with LLVM and musl #379632

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ad8cff6
rustc: use `targetPlatform` to detect pkgsLLVM
getchoo Feb 5, 2025
250ee55
rustc: fix `libunwind` handling in buildInputs
getchoo Feb 5, 2025
8f74c00
rustc: unbreak with LLVM and musl
getchoo Feb 5, 2025
e5e9952
rustc: remove libgcc_s spoofing hack
getchoo Feb 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 6 additions & 10 deletions pkgs/development/compilers/rust/rustc.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
llvmSharedForHost,
llvmSharedForTarget,
llvmPackages,
runCommandLocal,
fetchurl,
file,
python3,
Expand Down Expand Up @@ -353,14 +352,8 @@ stdenv.mkDerivation (finalAttrs: {
zlib
]
++ optional (!withBundledLLVM) llvmShared.lib
++ optional (useLLVM && !withBundledLLVM && !stdenv.targetPlatform.isFreeBSD) [
++ optionals (useLLVM && !withBundledLLVM && !stdenv.targetPlatform.isFreeBSD) [
llvmPackages.libunwind
# Hack which is used upstream https://github.com/gentoo/gentoo/blob/master/dev-lang/rust/rust-1.78.0.ebuild#L284
(runCommandLocal "libunwind-libgcc" { } ''
mkdir -p $out/lib
ln -s ${llvmPackages.libunwind}/lib/libunwind.so $out/lib/libgcc_s.so
ln -s ${llvmPackages.libunwind}/lib/libunwind.so $out/lib/libgcc_s.so.1
'')
];

outputs = [
Expand Down Expand Up @@ -421,10 +414,13 @@ stdenv.mkDerivation (finalAttrs: {
# If rustc can't target a platform, we also can't build rustc for
# that platform.
badPlatforms = rustc.badTargetPlatforms;
# Builds, but can't actually compile anything
# `-gnu` ABI targets do not support partial GNU userlands like `pkgsLLVM`, only `-musl` ABI targets do
# https://github.com/rust-lang/rust/issues/119504#issuecomment-1873544519
#
# It *can* still build, but it won't actually compile anything
# https://github.com/NixOS/nixpkgs/issues/311930
# https://github.com/rust-lang/rust/issues/55120
# https://github.com/rust-lang/rust/issues/82521
broken = stdenv.hostPlatform.useLLVM;
broken = stdenv.targetPlatform.useLLVM && stdenv.targetPlatform.libc != "musl";
};
})