From b8fa8e32b08eb59138dedcb488a2d65961e5e6d2 Mon Sep 17 00:00:00 2001 From: Marie Ramlow Date: Fri, 5 Sep 2025 19:37:26 +0200 Subject: [PATCH] rustc: fix rust-gdb, rust-gdbgui and rust-lldb on cross compilers Since cross compilers can also build code for the build platform, we should also install these debug scripts so they are available just like in our non-cross rustc. --- pkgs/development/compilers/rust/rustc.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix index 0754f7ec3521..98a74b022549 100644 --- a/pkgs/development/compilers/rust/rustc.nix +++ b/pkgs/development/compilers/rust/rustc.nix @@ -291,11 +291,11 @@ stdenv.mkDerivation (finalAttrs: { runHook preInstall python ./x.py --keep-stage=0 --stage=1 install library/std - mkdir -v $out/bin $doc $man - ln -s ${rustc.unwrapped}/bin/{rustc,rustdoc} $out/bin - ln -s ${rustc.unwrapped}/libexec $out + mkdir -v $doc $man + ln -s ${rustc.unwrapped}/{bin,libexec} $out rm -rf -v $out/lib/rustlib/{manifest-rust-std-,}${stdenv.hostPlatform.rust.rustcTargetSpec} ln -s ${rustc.unwrapped}/lib/rustlib/{manifest-rust-std-,}${stdenv.hostPlatform.rust.rustcTargetSpec} $out/lib/rustlib/ + ln -s ${rustc.unwrapped}/lib/rustlib/etc $out/lib/rustlib/ echo rust-std-${stdenv.hostPlatform.rust.rustcTargetSpec} >> $out/lib/rustlib/components lndir ${rustc.doc} $doc lndir ${rustc.man} $man