From 32946d2335b31fd7cc194e6b37694780654ede60 Mon Sep 17 00:00:00 2001 From: onur-ozkan Date: Sat, 4 Nov 2023 21:12:37 +0300 Subject: [PATCH] ensure existence of the tool crate dir before linking Signed-off-by: onur-ozkan --- src/bootstrap/src/core/build_steps/doc.rs | 30 ++++++++++++----------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/src/bootstrap/src/core/build_steps/doc.rs b/src/bootstrap/src/core/build_steps/doc.rs index 8929ad1a6cd4e..c23b0e7aaa2ff 100644 --- a/src/bootstrap/src/core/build_steps/doc.rs +++ b/src/bootstrap/src/core/build_steps/doc.rs @@ -829,13 +829,15 @@ macro_rules! tool_doc { builder.stage_out(compiler, Mode::ToolRustc).join("doc"), ]; - $(for krate in $crates { - let dir_name = krate.replace("-", "_"); - t!(fs::create_dir_all(&out.join(dir_name))); - })? + if !builder.config.dry_run() { + $(for krate in $crates { + let dir_name = krate.replace("-", "_"); + t!(fs::create_dir_all(out_dirs[0].join(&*dir_name))); + })? - for out_dir in out_dirs { - symlink_dir_force(&builder.config, &out, &out_dir); + for out_dir in &out_dirs { + symlink_dir_force(&builder.config, &out, &out_dir); + } } // Build cargo command. @@ -873,14 +875,14 @@ macro_rules! tool_doc { let _guard = builder.msg_doc(compiler, stringify!($tool).to_lowercase(), target); builder.run(&mut cargo.into()); - if !builder.config.dry_run() { - // Sanity check on linked doc directories - $(for krate in $crates { - let dir_name = krate.replace("-", "_"); - // Making sure the directory exists and is not empty. - assert!(out.join(&*dir_name).read_dir().unwrap().next().is_some()); - })? - } + // if !builder.config.dry_run() { + // // Sanity check on linked doc directories + // $(for krate in $crates { + // let dir_name = krate.replace("-", "_"); + // // Making sure the directory exists and is not empty. + // assert!(out.join(&*dir_name).read_dir().unwrap().next().is_some()); + // })? + // } } } }