Skip to content

Work-around lack of artifact dependencies when using cargo run -p bootstrap #94828

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

Closed
wants to merge 1 commit into from
Closed

Work-around lack of artifact dependencies when using cargo run -p bootstrap #94828

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 6 additions & 6 deletions src/bootstrap/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -442,12 +442,7 @@ impl Build {
let workspace_target_dir = std::env::var("CARGO_TARGET_DIR")
.map(PathBuf::from)
.unwrap_or_else(|_| src.join("target"));
let bootstrap_out = workspace_target_dir.join("debug");
if !bootstrap_out.join("rustc").exists() {
// this restriction can be lifted whenever https://github.com/rust-lang/rfcs/pull/3028 is implemented
panic!("run `cargo build --bins` before `cargo run`")
}
bootstrap_out
workspace_target_dir.join("debug")
};

let mut build = Build {
Expand Down Expand Up @@ -490,6 +485,11 @@ impl Build {
tool_artifacts: Default::default(),
};

if env::var("BOOTSTRAP_PYTHON").is_err() {
// This can be removed whenever https://github.com/rust-lang/rfcs/pull/3028 is implemented.
build.run(Command::new(env!("CARGO")).args(&["build", "-p", "bootstrap", "--bins"]));
}

build.verbose("finding compilers");
cc_detect::find(&mut build);
// When running `setup`, the profile is about to change, so any requirements we have now may
Expand Down