Commit 260fcc6

onur-ozkancuviper

authored and

committed

extend the list of registered dylibs on test::prepare_cargo_test

Signed-off-by: onur-ozkan <work@onurozkan.dev> (cherry picked from commit 7b25d4a)

1 parent 8a4c472 commit 260fcc6Copy full SHA for 260fcc6

File tree

-3

lines changed

-3

lines changed

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -2570,9 +2570,9 @@ fn prepare_cargo_test(`
`2570`	`2570`	`// We skip everything on Miri as then this overwrites the libdir set up`
`2571`	`2571`	// by `Cargo::new` and that actually makes things go wrong.
`2572`	`2572`	`if builder.kind != Kind::Miri {`
`2573`		`- let mut dylib_path = dylib_path();`
`2574`		`- dylib_path.insert(0,PathBuf::from(&*builder.sysroot_target_libdir(compiler, target)));`
`2575`		`- cargo.env(dylib_path_var(), env::join_paths(&dylib_path).unwrap());`
	`2573`	`+ let mut dylib_paths = builder.rustc_lib_paths(compiler);`
	`2574`	`+ dylib_paths.push(PathBuf::from(&builder.sysroot_target_libdir(compiler, target)));`
	`2575`	`+ helpers::add_dylib_path(dylib_paths,&mut cargo);`
`2576`	`2576`	`}`
`2577`	`2577`
`2578`	`2578`	`if builder.remote_tested(target) {`

Comments

(0)