Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

improve compiler&tool documenting and re-enable cranelift on CI #117574

Merged
merged 8 commits into from
Nov 5, 2023
Merged

improve compiler&tool documenting and re-enable cranelift on CI #117574

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift click to select a range
5e2de47
Ensure compiler crate paths are generated before linking
onur-ozkan Nov 4, 2023
fda009c
add sanity check for compiler crate docs
onur-ozkan Nov 4, 2023
d82fdb6
pass `CODEGEN_BACKENDS` to docker
lqd Oct 28, 2023
a9913eb
Ensure the rustc-codegen-cranelift-preview component is never empty
bjorn3 Oct 28, 2023
451778b
handle dry runs in `dist::CodegenBackend`
lqd Oct 29, 2023
55b4945
ensure doc directory is not empty
onur-ozkan Nov 4, 2023
52933e0
Don't disable inline asm usage in compiler-builtins when the cranelif…
bjorn3 Nov 4, 2023
b0df821
bootstrap: improve linking of tool docs
onur-ozkan Nov 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Ensure compiler crate paths are generated before linking 
Signed-off-by: onur-ozkan <[email protected]>
  • Loading branch information
@onur-ozkan
onur-ozkan committed Nov 4, 2023
commit 5e2de479fa07a365d89bacac473f241960970b21
23 changes: 12 additions & 11 deletions src/bootstrap/src/core/build_steps/doc.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -685,18 685,7 @@ impl Step for Rustc {
target,
);

// This uses a shared directory so that librustdoc documentation gets
// correctly built and merged with the rustc documentation. This is
// needed because rustdoc is built in a different directory from
// rustc. rustdoc needs to be able to see everything, for example when
// merging the search index, or generating local (relative) links.
let out_dir = builder.stage_out(compiler, Mode::Rustc).join(target.triple).join("doc");
t!(fs::create_dir_all(out_dir.parent().unwrap()));
symlink_dir_force(&builder.config, &out, &out_dir);
// Cargo puts proc macros in `target/doc` even if you pass `--target`
// explicitly (https://github.com/rust-lang/cargo/issues/7677).
let proc_macro_out_dir = builder.stage_out(compiler, Mode::Rustc).join("doc");
symlink_dir_force(&builder.config, &out, &proc_macro_out_dir);

// Build cargo command.
let mut cargo = builder.cargo(compiler, Mode::Rustc, SourceType::InTree, target, "doc");
Expand Down Expand Up @@ -736,6 725,18 @@ impl Step for Rustc {
}
}

// This uses a shared directory so that librustdoc documentation gets
// correctly built and merged with the rustc documentation.
//
// This is needed because rustdoc is built in a different directory from
// rustc. rustdoc needs to be able to see everything, for example when
// merging the search index, or generating local (relative) links.
symlink_dir_force(&builder.config, &out, &out_dir);
// Cargo puts proc macros in `target/doc` even if you pass `--target`
// explicitly (https://github.com/rust-lang/cargo/issues/7677).
let proc_macro_out_dir = builder.stage_out(compiler, Mode::Rustc).join("doc");
symlink_dir_force(&builder.config, &out, &proc_macro_out_dir);

builder.run(&mut cargo.into());

if builder.paths.iter().any(|path| path.ends_with("compiler")) {
Expand Down