mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rewrite archive-duplicate-names to rmake

Browse Source
This commit is contained in:
Oneirical 2024-07-16 15:30:41 -04:00
parent aeca91e08d
commit 47c21012ef
3 changed files with 37 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/tools/tidy/src/allowed_run_make_makefiles.txt
View File

@ -1,4 +1,3 @@
run-make/archive-duplicate-names/Makefile
run-make/branch-protection-check-IBT/Makefile run-make/branch-protection-check-IBT/Makefile
run-make/c-dynamic-dylib/Makefile run-make/c-dynamic-dylib/Makefile
run-make/c-dynamic-rlib/Makefile run-make/c-dynamic-rlib/Makefile

16
tests/run-make/archive-duplicate-names/Makefile
View File

@ -1,16 +0,0 @@
# When two object archives with the same filename are present, an iterator is supposed to inspect each object, recognize the duplication and extract each one to a different directory.
# This test checks that this duplicate handling behaviour has not been broken.
# See https://github.com/rust-lang/rust/pull/24439
# ignore-cross-compile
include ../tools.mk
all:
mkdir $(TMPDIR)/a
mkdir $(TMPDIR)/b
$(call COMPILE_OBJ,$(TMPDIR)/a/foo.o,foo.c)
$(call COMPILE_OBJ,$(TMPDIR)/b/foo.o,bar.c)
$(AR) crus $(TMPDIR)/libfoo.a $(TMPDIR)/a/foo.o $(TMPDIR)/b/foo.o
$(RUSTC) foo.rs
$(RUSTC) bar.rs
$(call RUN,bar)

37
tests/run-make/archive-duplicate-names/rmake.rs Normal file
View File

@ -0,0 +1,37 @@
// When two object archives with the same filename are present, an iterator is supposed to
// inspect each object, recognize the duplication and extract each one to a different directory.
// This test checks that this duplicate handling behaviour has not been broken.
// See https://github.com/rust-lang/rust/pull/24439
//@ ignore-cross-compile
// Reason: the compiled binary is executed
use run_make_support::{cc, is_msvc, llvm_ar, rfs, run, rustc};
fn main() {
rfs::create_dir("a");
rfs::create_dir("b");
compile_obj_force_foo("a", "foo");
compile_obj_force_foo("b", "bar");
let mut ar = llvm_ar();
ar.obj_to_ar().arg("libfoo.a");
if is_msvc() {
ar.arg("a/foo.obj").arg("b/foo.obj").run();
} else {
ar.arg("a/foo.o").arg("b/foo.o").run();
}
rustc().input("foo.rs").run();
rustc().input("bar.rs").run();
run("bar");
}
#[track_caller]
pub fn compile_obj_force_foo(dir: &str, lib_name: &str) {
let obj_file = if is_msvc() { format!("{dir}/foo") } else { format!("{dir}/foo.o") };
let src = format!("{lib_name}.c");
if is_msvc() {
cc().arg("-c").out_exe(&obj_file).input(src).run();
} else {
cc().arg("-v").arg("-c").out_exe(&obj_file).input(src).run();
};
}