Auto merge of #73456 - tmiasko:musl-libdir, r=Mark-Simulacrum

bootstrap: Configurable musl libdir

Make it possible to customize the location of musl libdir using
musl-libdir in config.toml, e.g., to use lib64 instead of lib.

diff --cc config.toml.example
Simple merge

diff --cc src/bootstrap/compile.rs
index b07ff21755e0cae97296bc2027241624b2b1d274,62bca0015c063056688bae2d38f503932ed78ff2..84545dcedb6d972480c1026dd6494bfcefc88178
--- 1/src/bootstrap/compile.rs
--- 2/src/bootstrap/compile.rs
+++ b/src/bootstrap/compile.rs
@@@ -177,16 -133,9 +177,16 @@@ fn copy_self_contained_objects
      // To do that we have to distribute musl startup objects as a part of Rust toolchain
      // and link with them manually in the self-contained mode.
      if target.contains("musl") {
-         let srcdir = builder.musl_root(target).unwrap().join("lib");
+         let srcdir = builder.musl_libdir(target).unwrap();
          for &obj in &["crt1.o", "Scrt1.o", "rcrt1.o", "crti.o", "crtn.o"] {
 -            copy_and_stamp(&srcdir, obj);
 +            copy_and_stamp(
 +                builder,
 +                &libdir_self_contained,
 +                &srcdir,
 +                obj,
 +                &mut target_deps,
 +                DependencyType::TargetSelfContained,
 +            );
          }
      } else if target.ends_with("-wasi") {
          let srcdir = builder.wasi_root(target).unwrap().join("lib/wasm32-wasi");

diff --cc src/bootstrap/lib.rs
Simple merge