diff options
| author | bors <bors@rust-lang.org> | 2024-10-28 07:14:11 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-10-28 07:14:11 +0000 |
| commit | 66701c42263042f7120385725606edeb987ad4f1 (patch) | |
| tree | 96dfa9e60522906eb23e41080cc1d6b54f6ed896 /src | |
| parent | 6929a48275547ef2aae72b85b5b5d8e4acbb5067 (diff) | |
| parent | 3e3feac7c3c6e3561b7a452e3764810f2edd1c33 (diff) | |
| download | rust-66701c42263042f7120385725606edeb987ad4f1.tar.gz rust-66701c42263042f7120385725606edeb987ad4f1.zip | |
Auto merge of #132251 - jieyouxu:rollup-mtv9mpd, r=jieyouxu
Rollup of 7 pull requests Successful merges: - #131633 (error on alignments greater than `isize::MAX`) - #132086 (Tweak E0277 highlighting and "long type" path printing) - #132220 (Add GUI regression test for doc struct fields margins) - #132225 (Dynamically link run-make support) - #132227 (Pass constness with span into lower_poly_trait_ref) - #132242 (Support `char::is_digit` in const contexts.) - #132243 (Remove `ObligationCause::span()` method) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'src')
| -rw-r--r-- | src/tools/compiletest/src/runtest/run_make.rs | 1 | ||||
| -rw-r--r-- | src/tools/run-make-support/Cargo.toml | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/src/tools/compiletest/src/runtest/run_make.rs b/src/tools/compiletest/src/runtest/run_make.rs index e7ae773ffa1..04bc2d7787d 100644 --- a/src/tools/compiletest/src/runtest/run_make.rs +++ b/src/tools/compiletest/src/runtest/run_make.rs @@ -329,6 +329,7 @@ impl TestCx<'_> { .arg(format!("run_make_support={}", &support_lib_path.to_string_lossy())) .arg("--edition=2021") .arg(&self.testpaths.file.join("rmake.rs")) + .arg("-Cprefer-dynamic") // Provide necessary library search paths for rustc. .env(dylib_env_var(), &env::join_paths(host_dylib_search_paths).unwrap()); diff --git a/src/tools/run-make-support/Cargo.toml b/src/tools/run-make-support/Cargo.toml index d3605cd3dce..3affa199fa5 100644 --- a/src/tools/run-make-support/Cargo.toml +++ b/src/tools/run-make-support/Cargo.toml @@ -13,3 +13,6 @@ gimli = "0.31.0" build_helper = { path = "../build_helper" } serde_json = "1.0" libc = "0.2" + +[lib] +crate-type = ["lib", "dylib"] |