rust-lang
diff --git a/‎src/bootstrap/src/core/build_steps/test.rs‎
Lines changed: 1 addition & 0 deletions b/‎src/bootstrap/src/core/build_steps/test.rs‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎src/tools/compiletest/src/cli.rs‎
Lines changed: 4 additions & 0 deletions b/‎src/tools/compiletest/src/cli.rs‎
Lines changed: 4 additions & 0 deletions
diff --git a/‎src/tools/compiletest/src/common.rs‎
Lines changed: 9 additions & 1 deletion b/‎src/tools/compiletest/src/common.rs‎
Lines changed: 9 additions & 1 deletion
diff --git a/‎src/tools/compiletest/src/rustdoc_gui_test.rs‎
Lines changed: 1 addition & 0 deletions b/‎src/tools/compiletest/src/rustdoc_gui_test.rs‎
Lines changed: 1 addition & 0 deletions
@@ -2372,6 +2372,7 @@ NOTE: if you're sure you want to do this, please open an issue as to why. In the
         cmd.arg("--rustc-path").arg(builder.rustc(test_compiler));
         if let Some(query_compiler) = query_compiler {
             cmd.arg("--query-rustc-path").arg(builder.rustc(query_compiler));
+            cmd.arg("--query-rustc-lib-path").arg(builder.rustc_libdir(query_compiler));
         }
 
         // Minicore auxiliary lib for `no_core` tests that need `core` stubs in cross-compilation
 
@@ -126,6 +126,9 @@ struct Args {
     /// Path to rustc to use for querying target information.
     #[arg(long)]
     query_rustc_path: Option<Utf8PathBuf>,
+    /// Path to shared libraries for querying target information.
+    #[arg(long)]
+    query_rustc_lib_path: Option<Utf8PathBuf>,
     /// Path to rustdoc to use for compiling.
     #[arg(long)]
     rustdoc_path: Option<Utf8PathBuf>,
@@ -486,6 +489,7 @@ pub(crate) fn parse_config(args: Vec<String>) -> Config {
         profiler_runtime: args.profiler_runtime,
 
         python: args.python,
+        query_rustc_lib_path: args.query_rustc_lib_path,
         query_rustc_path: args.query_rustc_path,
         remote_test_client: args.remote_test_client,
         run,
 
@@ -362,6 +362,11 @@ pub(crate) struct Config {
     /// (in case the JSON format has changed since the last bootstrap bump).
     pub(crate) query_rustc_path: Option<Utf8PathBuf>,
 
+    /// Path to the libraries needed to run the compiler at [`Self::query_rustc_path`].
+    ///
+    /// If unset, [`Self::host_compile_lib_path`] will be used instead.
+    pub(crate) query_rustc_lib_path: Option<Utf8PathBuf>,
+
     /// Path to the `rustdoc`-under-test. Like [`Self::rustc_path`], this `rustdoc` is *staged*.
     pub(crate) rustdoc_path: Option<Utf8PathBuf>,
 
@@ -1194,7 +1199,10 @@ pub(crate) fn query_rustc_output(
     let query_rustc_path = config.query_rustc_path.as_deref().unwrap_or(&config.rustc_path);
 
     let mut command = Command::new(query_rustc_path);
-    add_dylib_path(&mut command, iter::once(&config.host_compile_lib_path));
+    add_dylib_path(
+        &mut command,
+        iter::once(config.query_rustc_lib_path.as_deref().unwrap_or(&config.host_compile_lib_path)),
+    );
     command.args(&config.target_rustcflags).args(args);
     command.env("RUSTC_BOOTSTRAP", "1");
     command.envs(envs);
 
@@ -66,6 +66,7 @@ fn incomplete_config_for_rustdoc_gui_test() -> Config {
         run_make_support_rlib: Default::default(),
         run_make_support_rmeta: Default::default(),
         query_rustc_path: Default::default(),
+        query_rustc_lib_path: Default::default(),
         rustdoc_path: Default::default(),
         coverage_dump_path: Default::default(),
         python: Default::default(),
Original file line number	Diff line number	Diff line change
`@@ -2372,6 +2372,7 @@ NOTE: if you're sure you want to do this, please open an issue as to why. In the`
`2372`	`2372`	`cmd.arg("--rustc-path").arg(builder.rustc(test_compiler));`
`2373`	`2373`	`if let Some(query_compiler) = query_compiler {`
`2374`	`2374`	`cmd.arg("--query-rustc-path").arg(builder.rustc(query_compiler));`
	`2375`	`+ cmd.arg("--query-rustc-lib-path").arg(builder.rustc_libdir(query_compiler));`
`2375`	`2376`	`}`
`2376`	`2377`
`2377`	`2378`	// Minicore auxiliary lib for `no_core` tests that need `core` stubs in cross-compilation