Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rollup of 7 pull requests #126082

Closed
wants to merge 15 commits into from
Closed
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Migrate run-make/symlinked-rlib to rmake.rs
GuillaumeGomez committed Jun 6, 2024
commit 577218152e7ff1fe089e65f7f7c583ef31726c17
1 change: 0 additions & 1 deletion src/tools/tidy/src/allowed_run_make_makefiles.txt
Original file line number Diff line number Diff line change
@@ -238,7 +238,6 @@ run-make/symbol-visibility/Makefile
run-make/symbols-include-type-name/Makefile
run-make/symlinked-extern/Makefile
run-make/symlinked-libraries/Makefile
run-make/symlinked-rlib/Makefile
run-make/sysroot-crates-are-unstable/Makefile
run-make/target-cpu-native/Makefile
run-make/target-specs/Makefile
10 changes: 0 additions & 10 deletions tests/run-make/symlinked-rlib/Makefile

This file was deleted.

20 changes: 20 additions & 0 deletions tests/run-make/symlinked-rlib/rmake.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
//@ ignore-cross-compile
// `ln` is actually `cp` on msys.
//@ ignore-windows

use run_make_support::{rustc, tmp_dir};
use std::process::Command;

fn main() {
let out = tmp_dir().join("foo.xxx");

rustc().input("foo.rs").crate_type("rlib").output(&out).run();
let output = Command::new("ln")
.arg("-nsf")
.arg(out)
.arg(tmp_dir().join("libfoo.rlib"))
.output()
.unwrap();
assert!(output.status.success());
rustc().input("bar.rs").library_search_path(tmp_dir()).run();
}
Loading
Oops, something went wrong.