Skip to content

Commit 8ff5334

Browse files
Rollup merge of rust-lang#126015 - GuillaumeGomez:migrate-run-make-symlinked-rlib, r=jieyouxu
Migrate `run-make/symlinked-rlib` to `rmake.rs` Part of rust-lang#121876. r? ``@jieyouxu``
2 parents b09f5a1 + 5772181 commit 8ff5334

File tree

3 files changed

+20
-11
lines changed

3 files changed

+20
-11
lines changed

src/tools/tidy/src/allowed_run_make_makefiles.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,6 @@ run-make/symbol-visibility/Makefile
235235
run-make/symbols-include-type-name/Makefile
236236
run-make/symlinked-extern/Makefile
237237
run-make/symlinked-libraries/Makefile
238-
run-make/symlinked-rlib/Makefile
239238
run-make/sysroot-crates-are-unstable/Makefile
240239
run-make/target-cpu-native/Makefile
241240
run-make/target-specs/Makefile

tests/run-make/symlinked-rlib/Makefile

Lines changed: 0 additions & 10 deletions
This file was deleted.
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
//@ ignore-cross-compile
2+
// `ln` is actually `cp` on msys.
3+
//@ ignore-windows
4+
5+
use run_make_support::{rustc, tmp_dir};
6+
use std::process::Command;
7+
8+
fn main() {
9+
let out = tmp_dir().join("foo.xxx");
10+
11+
rustc().input("foo.rs").crate_type("rlib").output(&out).run();
12+
let output = Command::new("ln")
13+
.arg("-nsf")
14+
.arg(out)
15+
.arg(tmp_dir().join("libfoo.rlib"))
16+
.output()
17+
.unwrap();
18+
assert!(output.status.success());
19+
rustc().input("bar.rs").library_search_path(tmp_dir()).run();
20+
}

0 commit comments

Comments
 (0)