run-make-support: set rustc dylib path for cargo wrapper
Some run-make tests invoke Cargo via run_make_support::cargo(), but fail to
execute correctly when rustc is built without rpath. In these setups, runtime
loading of rustc’s shared libraries fails unless the appropriate dynamic library
path is set manually.
This commit updates the cargo() wrapper to call set_host_compiler_dylib_path(),
aligning its behavior with the existing rustc() wrapper:
f76c7367c6/src/tools/run-make-support/src/external_deps/rustc.rs (L39)
This ensures that Cargo invocations during tests inherit the necessary dylib
paths, avoiding errors related to missing shared libraries in rpath-less builds.
Fixes part of #140738
This commit is contained in:
parent
891b852547
commit
cd2dc67ead
1 changed files with 4 additions and 1 deletions
|
|
@ -1,8 +1,11 @@
|
|||
use crate::command::Command;
|
||||
use crate::env_var;
|
||||
use crate::util::set_host_compiler_dylib_path;
|
||||
|
||||
/// Returns a command that can be used to invoke cargo. The cargo is provided by compiletest
|
||||
/// through the `CARGO` env var.
|
||||
pub fn cargo() -> Command {
|
||||
Command::new(env_var("CARGO"))
|
||||
let mut cmd = Command::new(env_var("CARGO"));
|
||||
set_host_compiler_dylib_path(&mut cmd);
|
||||
cmd
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue