rust-libexec.diff 1.4 KB

12345678910111213141516171819202122232425
  1. diff -u -r rustc-1.50.0-src/src/bootstrap/dist.rs rustc-1.50.0-src-nolibexec/src/bootstrap/dist.rs
  2. --- rustc-1.50.0-src/src/bootstrap/dist.rs 2021-02-10 17:36:44.000000000 +0000
  3. +++ rustc-1.50.0-src-nolibexec/src/bootstrap/dist.rs 2021-02-11 18:23:36.312495419 +0000
  4. @@ -980,7 +980,7 @@
  5. for dirent in fs::read_dir(cargo.parent().unwrap()).expect("read_dir") {
  6. let dirent = dirent.expect("read dir entry");
  7. if dirent.file_name().to_str().expect("utf8").starts_with("cargo-credential-") {
  8. - tarball.add_file(&dirent.path(), "libexec", 0o755);
  9. + tarball.add_file(&dirent.path(), "lib", 0o755);
  10. }
  11. }
  12. diff -u -r rustc-1.50.0-src/src/tools/cargo/src/cargo/ops/registry/auth.rs rustc-1.50.0-src-nolibexec/src/tools/cargo/src/cargo/ops/registry/auth.rs
  13. --- rustc-1.50.0-src/src/tools/cargo/src/cargo/ops/registry/auth.rs 2021-02-10 17:37:00.000000000 +0000
  14. +++ rustc-1.50.0-src-nolibexec/src/tools/cargo/src/cargo/ops/registry/auth.rs 2021-02-11 18:24:14.944321464 +0000
  15. @@ -223,7 +223,7 @@
  16. .parent()
  17. .and_then(|p| p.parent())
  18. .ok_or_else(|| format_err!("expected cargo path {}", cargo.display()))?;
  19. - let exe = root.join("libexec").join(format!(
  20. + let exe = root.join("lib").join(format!(
  21. "cargo-credential-{}{}",
  22. cred_name,
  23. std::env::consts::EXE_SUFFIX