Move --sysroot argument out of the argument file to fix miri issue

rust-lang · Mar 25, 2024 · ac9b4e6 · ac9b4e6
1 parent 42198bf
commit ac9b4e6
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/src/librustdoc/doctest.rs b/src/librustdoc/doctest.rs
@@ -67,9 +67,6 @@ pub(crate) fn generate_args_file(file_path: &Path, options: &RustdocOptions) ->
         }
     }
 
-    if let Some(sysroot) = &options.maybe_sysroot {
-        content.push(format!("--sysroot={}", sysroot.display()));
-    }
     for lib_str in &options.lib_strs {
         content.push(format!("-L{lib_str}"));
     }
@@ -411,6 +408,10 @@ fn run_test(
 
     compiler.arg(&format!("@{}", rustdoc_options.arg_file.display()));
 
+    if let Some(sysroot) = &rustdoc_options.maybe_sysroot {
+        compiler.arg(format!("--sysroot={}", sysroot.display()));
+    }
+
     compiler.arg("--edition").arg(&edition.to_string());
     compiler.env("UNSTABLE_RUSTDOC_TEST_PATH", path);
     compiler.env("UNSTABLE_RUSTDOC_TEST_LINE", format!("{}", line as isize - line_offset as isize));