bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Rollup merge of #132225 - clubby789:run-make-dynamic, r=jieyouxu

Browse source 
Dynamically link run-make support

Fixes #131810

r? `@jieyouxu`
This commit is contained in:
许杰友 Jieyou Xu (Joe) 2024-10-28 13:36:19 +08:00 • committed by GitHub
commit afc93a9128
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 4 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/tools/compiletest/src/runtest/run_make.rs
View file

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

3
src/tools/run-make-support/Cargo.toml
View file

@ -13,3 +13,6 @@ gimli = "0.31.0"
build_helper = { path = "../build_helper" } build_helper = { path = "../build_helper" }
serde_json = "1.0" serde_json = "1.0"
libc = "0.2" libc = "0.2"
[lib]
crate-type = ["lib", "dylib"]