Skip to content

Commit c3fc9a9

Browse files
authored
Unrolled build for rust-lang#125886
Rollup merge of rust-lang#125886 - GuillaumeGomez:migrate-run-make-issue-15460, r=jieyouxu Migrate run make issue 15460 Part of rust-lang#121876. r? `@jieyouxu` try-job: x86_64-msvc try-job: aarch64-apple try-job: x86_64-gnu-llvm-18
2 parents 84c257e + 3de5252 commit c3fc9a9

File tree

7 files changed

+16
-8
lines changed

7 files changed

+16
-8
lines changed

src/tools/compiletest/src/runtest.rs

+2
Original file line numberDiff line numberDiff line change
@@ -3378,6 +3378,7 @@ impl<'test> TestCx<'test> {
33783378
cmd.env("IS_MSVC", "1")
33793379
.env("IS_WINDOWS", "1")
33803380
.env("MSVC_LIB", format!("'{}' -nologo", lib.display()))
3381+
.env("MSVC_LIB_PATH", format!("{}", lib.display()))
33813382
.env("CC", format!("'{}' {}", self.config.cc, cflags))
33823383
.env("CXX", format!("'{}' {}", &self.config.cxx, cxxflags));
33833384
} else {
@@ -3748,6 +3749,7 @@ impl<'test> TestCx<'test> {
37483749
cmd.env("IS_MSVC", "1")
37493750
.env("IS_WINDOWS", "1")
37503751
.env("MSVC_LIB", format!("'{}' -nologo", lib.display()))
3752+
.env("MSVC_LIB_PATH", format!("{}", lib.display()))
37513753
// Note: we diverge from legacy run_make and don't lump `CC` the compiler and
37523754
// default flags together.
37533755
.env("CC_DEFAULT_FLAGS", &cflags)

src/tools/tidy/src/allowed_run_make_makefiles.txt

-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ run-make/foreign-rust-exceptions/Makefile
2727
run-make/incr-add-rust-src-component/Makefile
2828
run-make/incr-foreign-head-span/Makefile
2929
run-make/interdependent-c-libraries/Makefile
30-
run-make/issue-15460/Makefile
3130
run-make/issue-35164/Makefile
3231
run-make/issue-36710/Makefile
3332
run-make/issue-47551/Makefile

tests/run-make/issue-15460/Makefile

-7
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
// Regression test for <https://github.com/rust-lang/rust/issues/15460>.
2+
3+
//@ ignore-cross-compile
4+
5+
use run_make_support::{build_native_static_lib, run, rustc};
6+
7+
fn main() {
8+
build_native_static_lib("foo");
9+
10+
rustc().input("foo.rs").extra_filename("-383hf8").arg("-Cprefer-dynamic").run();
11+
rustc().input("bar.rs").run();
12+
13+
run("bar");
14+
}

0 commit comments

Comments
 (0)