diff options
| author | Oli Scherer <github@oli-obk.de> | 2024-09-16 10:26:42 +0200 |
|---|---|---|
| committer | Oli Scherer <github@oli-obk.de> | 2024-09-16 23:05:42 +0200 |
| commit | 4dabcc3ab43e92041547efdc98401f1c2dfe6044 (patch) | |
| tree | a06ed056e56036f118113c9c0eac8211d3d8d3be /src | |
| parent | 987702f6b9c1258493378b8d181585c55623041d (diff) | |
| download | rust-4dabcc3ab43e92041547efdc98401f1c2dfe6044.tar.gz rust-4dabcc3ab43e92041547efdc98401f1c2dfe6044.zip | |
Fix run --dep
Diffstat (limited to 'src')
| -rw-r--r-- | src/tools/miri/miri-script/src/commands.rs | 10 | ||||
| -rw-r--r-- | src/tools/miri/tests/ui.rs | 1 |
2 files changed, 8 insertions, 3 deletions
diff --git a/src/tools/miri/miri-script/src/commands.rs b/src/tools/miri/miri-script/src/commands.rs index 7348acac5a9..b18c8453d66 100644 --- a/src/tools/miri/miri-script/src/commands.rs +++ b/src/tools/miri/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/src/tools/miri/tests/ui.rs b/src/tools/miri/tests/ui.rs index 10b29deefad..d405eb92ad1 100644 --- a/src/tools/miri/tests/ui.rs +++ b/src/tools/miri/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(); |
