diff options
| author | Eric Huss <eric@huss.org> | 2020-06-23 15:00:48 -0700 |
|---|---|---|
| committer | Eric Huss <eric@huss.org> | 2020-06-26 07:45:28 -0700 |
| commit | 6654c5852f76d6b55ebdacc0d428cad5b3dbdbed (patch) | |
| tree | 329b8ba1040ebe0e0ccb40a9c2d20996c2ea255b /src/bootstrap | |
| parent | 9672b5e95c520774cc17bffc7031c80a1bcf4b4c (diff) | |
Remove mdbook-linkcheck.
Diffstat (limited to 'src/bootstrap')
| -rw-r--r-- | src/bootstrap/tool.rs | 19 |
1 files changed, 2 insertions, 17 deletions
diff --git a/src/bootstrap/tool.rs b/src/bootstrap/tool.rs index 0055dee6092..063fb8fbb95 100644 --- a/src/bootstrap/tool.rs +++ b/src/bootstrap/tool.rs @@ -12,7 +12,7 @@ use crate::channel; use crate::channel::GitInfo; use crate::compile; use crate::toolstate::ToolState; -use crate::util::{add_dylib_path, exe, CiEnv}; +use crate::util::{add_dylib_path, exe}; use crate::Compiler; use crate::Mode; @@ -236,7 +236,6 @@ pub fn prepare_tool_cargo( || path.ends_with("rls") || path.ends_with("clippy") || path.ends_with("miri") - || path.ends_with("rustbook") || path.ends_with("rustfmt") { cargo.env("LIBZ_SYS_STATIC", "1"); @@ -272,20 +271,6 @@ pub fn prepare_tool_cargo( cargo } -fn rustbook_features() -> Vec<String> { - let mut features = Vec::new(); - - // Due to CI budged and risk of spurious failures we want to limit jobs running this check. - // At same time local builds should run it regardless of the platform. - // `CiEnv::None` means it's local build and `CHECK_LINKS` is defined in x86_64-gnu-tools to - // explicitly enable it on single job - if CiEnv::current() == CiEnv::None || env::var("CHECK_LINKS").is_ok() { - features.push("linkcheck".to_string()); - } - - features -} - macro_rules! bootstrap_tool { ($( $name:ident, $path:expr, $tool_name:expr @@ -368,7 +353,7 @@ macro_rules! bootstrap_tool { } bootstrap_tool!( - Rustbook, "src/tools/rustbook", "rustbook", features = rustbook_features(); + Rustbook, "src/tools/rustbook", "rustbook"; UnstableBookGen, "src/tools/unstable-book-gen", "unstable-book-gen"; Tidy, "src/tools/tidy", "tidy"; Linkchecker, "src/tools/linkchecker", "linkchecker"; |
