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

Rollup merge of #128696 - Oneirical:second-linkage-rampage, r=jieyouxu

Browse Source 
Migrate `staticlib-dylib-linkage` `run-make` test to rmake

Part of #121876 and the associated [Google Summer of Code project](https://blog.rust-lang.org/2024/05/01/gsoc-2024-selected-projects.html).

I'm quite sure this has the same issue as the one brought up in [this discussion](https://github.com/rust-lang/rust/pull/128407#discussion_r1702439172), so I elected to keep the ignore MSVC.

try-job: aarch64-apple
try-job: x86_64-gnu-llvm-17
try-job: armhf-gnu
This commit is contained in:
Matthias Krüger 2024-08-07 19:35:07 +02:00 committed by GitHub
commit 26787a8c0d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 37 additions and 22 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

@ -20,7 +20,6 @@ run-make/remap-path-prefix-dwarf/Makefile
run-make/reproducible-build/Makefile
run-make/rlib-format-packed-bundled-libs/Makefile
run-make/split-debuginfo/Makefile
run-make/staticlib-dylib-linkage/Makefile
run-make/symbol-mangling-hashed/Makefile
run-make/sysroot-crates-are-unstable/Makefile
run-make/thumb-none-qemu/Makefile

21
tests/run-make/staticlib-dylib-linkage/Makefile
View File

@ -1,21 +0,0 @@
include ../tools.mk
# ignore-cross-compile
# ignore-msvc FIXME(bjorn3) can't figure out how to link with the MSVC toolchain
# ignore-wasm wasm doesn't support dynamic libraries
all:
$(RUSTC) -C prefer-dynamic bar.rs
$(RUSTC) foo.rs --crate-type staticlib --print native-static-libs \
-Z staticlib-allow-rdylib-deps 2>&1 | grep 'note: native-static-libs: ' \
| sed 's/note: native-static-libs: \(.*\)/\1/' > $(TMPDIR)/libs.txt
cat $(TMPDIR)/libs.txt
ifdef IS_MSVC
$(CC) $(CFLAGS) /c foo.c /Fo:$(TMPDIR)/foo.o
$(RUSTC_LINKER) $(TMPDIR)/foo.o $(TMPDIR)/foo.lib $$(cat $(TMPDIR)/libs.txt) $(call OUT_EXE,foo)
else
$(CC) $(CFLAGS) foo.c -L $(TMPDIR) -lfoo $$(cat $(TMPDIR)/libs.txt) -o $(call RUN_BINFILE,foo)
endif
$(call RUN,foo)

37
tests/run-make/staticlib-dylib-linkage/rmake.rs Normal file
View File

@ -0,0 +1,37 @@
// A basic smoke test to check that rustc supports linking to a rust dylib with
// --crate-type staticlib. bar is a dylib, on which foo is dependent - the native
// static lib search paths are collected and used to compile foo.c, the final executable
// which depends on both foo and bar.
// See https://github.com/rust-lang/rust/pull/106560
//@ ignore-cross-compile
// Reason: the compiled binary is executed.
//@ ignore-wasm
// Reason: WASM does not support dynamic libraries
//@ ignore-msvc
//FIXME(Oneirical): Getting this to work on MSVC requires passing libcmt.lib to CC,
// which is not trivial to do.
// Tracking issue: https://github.com/rust-lang/rust/issues/128602
// Discussion: https://github.com/rust-lang/rust/pull/128407#discussion_r1702439172
use run_make_support::{cc, regex, run, rustc};
fn main() {
rustc().arg("-Cprefer-dynamic").input("bar.rs").run();
let libs = rustc()
.input("foo.rs")
.crate_type("staticlib")
.print("native-static-libs")
.arg("-Zstaticlib-allow-rdylib-deps")
.run()
.assert_stderr_contains("note: native-static-libs: ")
.stderr_utf8();
let re = regex::Regex::new(r#"note: native-static-libs:\s*(.+)"#).unwrap();
let libs = re.find(&libs).unwrap().as_str().trim();
// remove the note
let (_, library_search_paths) = libs.split_once("note: native-static-libs: ").unwrap();
// divide the command-line arguments in a vec
let library_search_paths = library_search_paths.split(' ').collect::<Vec<&str>>();
cc().input("foo.c").arg("-lfoo").args(library_search_paths).out_exe("foo").run();
run("foo");
}