nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-04-14 04:56:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Auto merge of #130620 - onur-ozkan:update-make-prepare, r=Kobzol

Browse Source 
remove workaround for make prepare and use dry-run build instead

Removes an annoying hard-coded logic.

try-job: x86_64-msvc
This commit is contained in:
bors 2024-09-23 22:19:24 +00:00
commit 35daf8b8aa
3 changed files with 14 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/bootstrap/mk/Makefile.in
View File

@ -95,7 +95,7 @@ install:
tidy:
$(Q)$(BOOTSTRAP) test --stage 2 src/tools/tidy $(BOOTSTRAP_ARGS)
prepare:
$(Q)$(BOOTSTRAP) build --stage 2 nonexistent/path/to/trigger/cargo/metadata
$(Q)$(BOOTSTRAP) build --stage 2 --dry-run
## MSVC native builders

25
src/bootstrap/src/core/sanity.rs
View File

@ -294,19 +294,19 @@ than building it.
}
}
for host in &build.hosts {
if !build.config.dry_run() {
if !build.config.dry_run() {
for host in &build.hosts {
cmd_finder.must_have(build.cxx(*host).unwrap());
}
if build.config.llvm_enabled(*host) {
// Externally configured LLVM requires FileCheck to exist
let filecheck = build.llvm_filecheck(build.build);
if !filecheck.starts_with(&build.out)
&& !filecheck.exists()
&& build.config.codegen_tests
{
panic!("FileCheck executable {filecheck:?} does not exist");
if build.config.llvm_enabled(*host) {
// Externally configured LLVM requires FileCheck to exist
let filecheck = build.llvm_filecheck(build.build);
if !filecheck.starts_with(&build.out)
&& !filecheck.exists()
&& build.config.codegen_tests
{
panic!("FileCheck executable {filecheck:?} does not exist");
}
}
}
}
@ -355,7 +355,8 @@ than building it.
// There are three builds of cmake on windows: MSVC, MinGW, and
// Cygwin. The Cygwin build does not have generators for Visual
// Studio, so detect that here and error.
let out = command("cmake").arg("--help").run_capture_stdout(build).stdout();
let out =
command("cmake").arg("--help").run_always().run_capture_stdout(build).stdout();
if !out.contains("Visual Studio") {
panic!(
"

9
src/bootstrap/src/lib.rs
View File

@ -596,15 +596,6 @@ impl Build {
_ => (),
}
{
let builder = builder::Builder::new(self);
if let Some(path) = builder.paths.first() {
if path == Path::new("nonexistent/path/to/trigger/cargo/metadata") {
return;
}
}
}
if !self.config.dry_run() {
{
// We first do a dry-run. This is a sanity-check to ensure that