Skip to content

Commit afc93a9

Browse files
authored
Rollup merge of #132225 - clubby789:run-make-dynamic, r=jieyouxu
Dynamically link run-make support Fixes #131810 r? `@jieyouxu`
2 parents 5c14e3d + 9bb6e07 commit afc93a9

File tree

2 files changed

+4
-0
lines changed

2 files changed

+4
-0
lines changed

src/tools/compiletest/src/runtest/run_make.rs

+1
Original file line numberDiff line numberDiff line change
@@ -329,6 +329,7 @@ impl TestCx<'_> {
329329
.arg(format!("run_make_support={}", &support_lib_path.to_string_lossy()))
330330
.arg("--edition=2021")
331331
.arg(&self.testpaths.file.join("rmake.rs"))
332+
.arg("-Cprefer-dynamic")
332333
// Provide necessary library search paths for rustc.
333334
.env(dylib_env_var(), &env::join_paths(host_dylib_search_paths).unwrap());
334335

src/tools/run-make-support/Cargo.toml

+3
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,6 @@ gimli = "0.31.0"
1313
build_helper = { path = "../build_helper" }
1414
serde_json = "1.0"
1515
libc = "0.2"
16+
17+
[lib]
18+
crate-type = ["lib", "dylib"]

0 commit comments

Comments
 (0)