Skip to content

Commit 807a5c8

Browse files
Rollup merge of #152708 - PaulDance:patches/nix-stdenv.cc.cc.lib, r=clubby789
Build: Add `stdenv.cc.cc.lib` to Nix dependencies Otherwise, it systematically fails on: ``` error: process didn't exit successfully: `[...]/rust/build/bootstrap/debug/rustc [...]/rust/build/bootstrap/debug/rustc -vV` (exit status: 127) --- stderr [...]/rust/build/x86_64-unknown-linux-gnu/stage1/bin/rustc: error while loading shared libraries: libstdc++.so.6: cannot open shared object file: No such file or directory ``` for us at least. Closes #127620. @rustbot label T-bootstrap A-reproducibility
2 parents b014cb8 + 751b7d5 commit 807a5c8

1 file changed

Lines changed: 2 additions & 0 deletions

File tree

src/bootstrap/src/core/download.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -675,6 +675,7 @@ fn fix_bin_or_dylib(out: &Path, fname: &Path, exec_ctx: &ExecutionContext) {
675675
// the `.nix-deps` location.
676676
//
677677
// bintools: Needed for the path of `ld-linux.so` (via `nix-support/dynamic-linker`).
678+
// cc.lib: Needed similarly for `libstdc++.so.6`.
678679
// zlib: Needed as a system dependency of `libLLVM-*.so`.
679680
// patchelf: Needed for patching ELF binaries (see doc comment above).
680681
let nix_deps_dir = out.join(".nix-deps");
@@ -686,6 +687,7 @@ fn fix_bin_or_dylib(out: &Path, fname: &Path, exec_ctx: &ExecutionContext) {
686687
zlib
687688
patchelf
688689
stdenv.cc.bintools
690+
stdenv.cc.cc.lib
689691
];
690692
}
691693
";

0 commit comments

Comments
 (0)