diff options
| author | Jacob Pratt <jacob@jhpratt.dev> | 2025-06-22 08:49:07 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-06-22 08:49:07 +0200 |
| commit | b64292a0cc6f4a4568108b35a21cb2a1d2b486e1 (patch) | |
| tree | 2e8a379688b735dfd30a06dbe91036f9cff6bddb /tests | |
| parent | cbfb65429c9c7d1c82c5eb5170acfef025ee4ca6 (diff) | |
| parent | 0d50f9109bd0309122ea23094d9471684f18dc62 (diff) | |
| download | rust-b64292a0cc6f4a4568108b35a21cb2a1d2b486e1.tar.gz rust-b64292a0cc6f4a4568108b35a21cb2a1d2b486e1.zip | |
Rollup merge of #142845 - dpaoliello:textrel-on-minimal-lib, r=jieyouxu
Enable textrel-on-minimal-lib for Windows `bin_name` needs to be used when building a runnable executable. Addresses item in rust-lang/rust#128602 --- try-job: x86_64-mingw-* try-job: x86_64-msvc-* try-job: i686-msvc-*
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/run-make/textrel-on-minimal-lib/rmake.rs | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/tests/run-make/textrel-on-minimal-lib/rmake.rs b/tests/run-make/textrel-on-minimal-lib/rmake.rs index 625ded70ad6..08e2b45a75f 100644 --- a/tests/run-make/textrel-on-minimal-lib/rmake.rs +++ b/tests/run-make/textrel-on-minimal-lib/rmake.rs @@ -6,25 +6,23 @@ // See https://github.com/rust-lang/rust/issues/68794 //@ ignore-cross-compile -//@ ignore-windows -// Reason: There is no `bar.dll` produced by CC to run readobj on use run_make_support::{ - cc, dynamic_lib_name, extra_c_flags, extra_cxx_flags, llvm_readobj, rustc, static_lib_name, + bin_name, cc, extra_c_flags, extra_cxx_flags, llvm_readobj, rustc, static_lib_name, }; fn main() { rustc().input("foo.rs").run(); cc().input("bar.c") .input(static_lib_name("foo")) - .out_exe(&dynamic_lib_name("bar")) + .out_exe(&bin_name("bar")) .arg("-fPIC") .arg("-shared") .args(extra_c_flags()) .args(extra_cxx_flags()) .run(); llvm_readobj() - .input(dynamic_lib_name("bar")) + .input(bin_name("bar")) .arg("--dynamic") .run() .assert_stdout_not_contains("TEXTREL"); |
