about summary refs log tree commit diff
diff options
context:
space:
mode:
authoronur-ozkan <work@onurozkan.dev>2024-09-20 17:31:36 +0300
committeronur-ozkan <work@onurozkan.dev>2024-09-20 17:31:36 +0300
commit17aab60d6ffedf46564cf3ac40e91b55282201e7 (patch)
tree1d1e618b955c70a5a48c3b698f20e02029e0e102
parent60c3673456cb5eba4d6ac4ed22be179deebb6dcf (diff)
downloadrust-17aab60d6ffedf46564cf3ac40e91b55282201e7.tar.gz
rust-17aab60d6ffedf46564cf3ac40e91b55282201e7.zip
remove workaround for make prepare and use dry-run build instead
Signed-off-by: onur-ozkan <work@onurozkan.dev>
-rw-r--r--src/bootstrap/mk/Makefile.in2
-rw-r--r--src/bootstrap/src/lib.rs9
2 files changed, 1 insertions, 10 deletions
diff --git a/src/bootstrap/mk/Makefile.in b/src/bootstrap/mk/Makefile.in
index 3fa2b3c2292..92c8f5dc452 100644
--- a/src/bootstrap/mk/Makefile.in
+++ b/src/bootstrap/mk/Makefile.in
@@ -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
 
diff --git a/src/bootstrap/src/lib.rs b/src/bootstrap/src/lib.rs
index 4ed2c72fd55..0dfa0442ec1 100644
--- a/src/bootstrap/src/lib.rs
+++ b/src/bootstrap/src/lib.rs
@@ -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