Remove credential providers from bootstrap
since they are now built-in to the Cargo binary
This commit is contained in:
parent
cad9cd84dc
commit
ecfac686af
@ -1085,13 +1085,6 @@ fn run(self, builder: &Builder<'_>) -> Option<GeneratedTarball> {
|
||||
tarball.add_dir(etc.join("man"), "share/man/man1");
|
||||
tarball.add_legal_and_readme_to("share/doc/cargo");
|
||||
|
||||
for dirent in fs::read_dir(cargo.parent().unwrap()).expect("read_dir") {
|
||||
let dirent = dirent.expect("read dir entry");
|
||||
if dirent.file_name().to_str().expect("utf8").starts_with("cargo-credential-") {
|
||||
tarball.add_file(&dirent.path(), "libexec", 0o755);
|
||||
}
|
||||
}
|
||||
|
||||
Some(tarball.generate())
|
||||
}
|
||||
}
|
||||
|
@ -894,19 +894,10 @@ fn run(self, builder: &Builder<'_>) {
|
||||
"-p",
|
||||
"cargo-credential",
|
||||
"-p",
|
||||
"cargo-credential-1password",
|
||||
"-p",
|
||||
"mdman",
|
||||
// FIXME: this trips a license check in tidy.
|
||||
// "-p",
|
||||
// "resolver-tests",
|
||||
// FIXME: we should probably document these, but they're different per-platform so we can't use `tool_doc`.
|
||||
// "-p",
|
||||
// "cargo-credential-gnome-secret",
|
||||
// "-p",
|
||||
// "cargo-credential-macos-keychain",
|
||||
// "-p",
|
||||
// "cargo-credential-wincred",
|
||||
]
|
||||
);
|
||||
tool_doc!(Tidy, "tidy", "src/tools/tidy", rustc_tool = false, ["-p", "tidy"]);
|
||||
|
@ -558,39 +558,6 @@ fn run(self, builder: &Builder<'_>) -> PathBuf {
|
||||
allow_features: "",
|
||||
})
|
||||
.expect("expected to build -- essential tool");
|
||||
|
||||
let build_cred = |name, path| {
|
||||
// These credential helpers are currently experimental.
|
||||
// Any build failures will be ignored.
|
||||
let _ = builder.ensure(ToolBuild {
|
||||
compiler: self.compiler,
|
||||
target: self.target,
|
||||
tool: name,
|
||||
mode: Mode::ToolRustc,
|
||||
path,
|
||||
is_optional_tool: true,
|
||||
source_type: SourceType::Submodule,
|
||||
extra_features: Vec::new(),
|
||||
allow_features: "",
|
||||
});
|
||||
};
|
||||
|
||||
if self.target.contains("windows") {
|
||||
build_cred(
|
||||
"cargo-credential-wincred",
|
||||
"src/tools/cargo/credential/cargo-credential-wincred",
|
||||
);
|
||||
}
|
||||
if self.target.contains("apple-darwin") {
|
||||
build_cred(
|
||||
"cargo-credential-macos-keychain",
|
||||
"src/tools/cargo/credential/cargo-credential-macos-keychain",
|
||||
);
|
||||
}
|
||||
build_cred(
|
||||
"cargo-credential-1password",
|
||||
"src/tools/cargo/credential/cargo-credential-1password",
|
||||
);
|
||||
cargo_bin_path
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user