Skip to content

Commit b64292a

Browse files
authored
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 #128602 --- try-job: x86_64-mingw-* try-job: x86_64-msvc-* try-job: i686-msvc-*
2 parents cbfb654 + 0d50f91 commit b64292a

File tree

1 file changed

+3
-5
lines changed
  • tests/run-make/textrel-on-minimal-lib

1 file changed

+3
-5
lines changed

tests/run-make/textrel-on-minimal-lib/rmake.rs

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,25 +6,23 @@
66
// See https://github.com/rust-lang/rust/issues/68794
77

88
//@ ignore-cross-compile
9-
//@ ignore-windows
10-
// Reason: There is no `bar.dll` produced by CC to run readobj on
119

1210
use run_make_support::{
13-
cc, dynamic_lib_name, extra_c_flags, extra_cxx_flags, llvm_readobj, rustc, static_lib_name,
11+
bin_name, cc, extra_c_flags, extra_cxx_flags, llvm_readobj, rustc, static_lib_name,
1412
};
1513

1614
fn main() {
1715
rustc().input("foo.rs").run();
1816
cc().input("bar.c")
1917
.input(static_lib_name("foo"))
20-
.out_exe(&dynamic_lib_name("bar"))
18+
.out_exe(&bin_name("bar"))
2119
.arg("-fPIC")
2220
.arg("-shared")
2321
.args(extra_c_flags())
2422
.args(extra_cxx_flags())
2523
.run();
2624
llvm_readobj()
27-
.input(dynamic_lib_name("bar"))
25+
.input(bin_name("bar"))
2826
.arg("--dynamic")
2927
.run()
3028
.assert_stdout_not_contains("TEXTREL");

0 commit comments

Comments
 (0)