Fix run --dep

rust-lang · Sep 16, 2024 · ec39809 · ec39809
1 parent 45d93ac
commit ec39809
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/miri-script/src/commands.rs b/miri-script/src/commands.rs
@@ -503,9 +503,13 @@ impl Command {
         // More flags that we will pass before `flags`
         // (because `flags` may contain `--`).
         let mut early_flags = Vec::<OsString>::new();
-        if let Some(target) = &target {
-            early_flags.push("--target".into());
-            early_flags.push(target.into());
+
+        // In `dep` mode, the target is already passed via `MIRI_TEST_TARGET`
+        if !dep {
+            if let Some(target) = &target {
+                early_flags.push("--target".into());
+                early_flags.push(target.into());
+            }
         }
         early_flags.push("--edition".into());
         early_flags.push(edition.as_deref().unwrap_or("2021").into());

diff --git a/tests/ui.rs b/tests/ui.rs
@@ -337,6 +337,7 @@ fn run_dep_mode(target: String, args: impl Iterator<Item = OsString>) -> Result<
 
     let build_manager = BuildManager::one_off(config);
     let mut cmd = test_config.config.program.build(&test_config.config.out_dir);
+    cmd.arg("--target").arg(test_config.config.target.as_ref().unwrap());
     // Build dependencies
     test_config.apply_custom(&mut cmd, &build_manager).unwrap();