Skip to content

Commit

Permalink
rewrite redundant-libs to rmake
Browse files Browse the repository at this point in the history
  • Loading branch information
Oneirical committed Jul 26, 2024
1 parent 2892784 commit ea44345
Show file tree
Hide file tree
Showing 4 changed files with 30 additions and 26 deletions.
3 changes: 2 additions & 1 deletion src/tools/run-make-support/src/external_deps/c_build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,8 @@ pub fn build_native_static_lib(lib_name: &str) -> PathBuf {
pub fn build_native_dynamic_lib(lib_name: &str) -> PathBuf {
let obj_file = if is_msvc() { format!("{lib_name}") } else { format!("{lib_name}.o") };
let src = format!("{lib_name}.c");
let lib_path = dynamic_lib_name(lib_name);
let lib_path =
if is_msvc() { format!("{lib_name}.dll.lib") } else { dynamic_lib_name(lib_name) };
if is_msvc() {
cc().arg("-c").out_exe(&obj_file).input(src).run();
} else {
Expand Down
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
Expand Up @@ -62,7 +62,6 @@ run-make/print-target-list/Makefile
run-make/raw-dylib-import-name-type/Makefile
run-make/raw-dylib-link-ordinal/Makefile
run-make/raw-dylib-stdcall-ordinal/Makefile
run-make/redundant-libs/Makefile
run-make/remap-path-prefix-dwarf/Makefile
run-make/reproducible-build-2/Makefile
run-make/reproducible-build/Makefile
Expand Down
24 changes: 0 additions & 24 deletions tests/run-make/redundant-libs/Makefile

This file was deleted.

28 changes: 28 additions & 0 deletions tests/run-make/redundant-libs/rmake.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
// rustc will remove one of the two redundant references to foo below. Depending
// on which one gets removed, we'll get a linker error on SOME platforms (like
// Linux). On these platforms, when a library is referenced, the linker will
// only pull in the symbols needed _at that point in time_. If a later library
// depends on additional symbols from the library, they will not have been pulled
// in, and you'll get undefined symbols errors.
//
// So in this example, we need to ensure that rustc keeps the _later_ reference
// to foo, and not the former one.

//@ ignore-cross-compile
// Reason: the compiled binary is executed

//FIXME(Oneirical): msvc

use run_make_support::{build_native_dynamic_lib, build_native_static_lib, run, rustc};

fn main() {
build_native_dynamic_lib("foo");
build_native_static_lib("bar");
build_native_static_lib("baz");
rustc()
.input("main.rs")
.args(&["-lstatic=bar", "-lfoo", "-lstatic=baz", "-lfoo"])
.print("link-args")
.run();
run("main");
}

0 comments on commit ea44345

Please sign in to comment.