From 218caa410aa38c29984be31a5229b9fa717560ee Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Wed, 17 Apr 2024 14:19:13 +0200 Subject: Merging upstream version 1.68.2+dfsg1. Signed-off-by: Daniel Baumann --- tests/run-make-fulldeps/manual-link/Makefile | 6 ++++++ tests/run-make-fulldeps/manual-link/bar.c | 1 + tests/run-make-fulldeps/manual-link/foo.c | 1 + tests/run-make-fulldeps/manual-link/foo.rs | 11 +++++++++++ tests/run-make-fulldeps/manual-link/main.rs | 5 +++++ 5 files changed, 24 insertions(+) create mode 100644 tests/run-make-fulldeps/manual-link/Makefile create mode 100644 tests/run-make-fulldeps/manual-link/bar.c create mode 100644 tests/run-make-fulldeps/manual-link/foo.c create mode 100644 tests/run-make-fulldeps/manual-link/foo.rs create mode 100644 tests/run-make-fulldeps/manual-link/main.rs (limited to 'tests/run-make-fulldeps/manual-link') diff --git a/tests/run-make-fulldeps/manual-link/Makefile b/tests/run-make-fulldeps/manual-link/Makefile new file mode 100644 index 000000000..401f6eb44 --- /dev/null +++ b/tests/run-make-fulldeps/manual-link/Makefile @@ -0,0 +1,6 @@ +include ../tools.mk + +all: $(TMPDIR)/libbar.a + $(RUSTC) foo.rs -lstatic=bar + $(RUSTC) main.rs + $(call RUN,main) diff --git a/tests/run-make-fulldeps/manual-link/bar.c b/tests/run-make-fulldeps/manual-link/bar.c new file mode 100644 index 000000000..e42599986 --- /dev/null +++ b/tests/run-make-fulldeps/manual-link/bar.c @@ -0,0 +1 @@ +void bar() {} diff --git a/tests/run-make-fulldeps/manual-link/foo.c b/tests/run-make-fulldeps/manual-link/foo.c new file mode 100644 index 000000000..e42599986 --- /dev/null +++ b/tests/run-make-fulldeps/manual-link/foo.c @@ -0,0 +1 @@ +void bar() {} diff --git a/tests/run-make-fulldeps/manual-link/foo.rs b/tests/run-make-fulldeps/manual-link/foo.rs new file mode 100644 index 000000000..c1f28236f --- /dev/null +++ b/tests/run-make-fulldeps/manual-link/foo.rs @@ -0,0 +1,11 @@ +#![crate_type = "rlib"] + +extern "C" { + fn bar(); +} + +pub fn foo() { + unsafe { + bar(); + } +} diff --git a/tests/run-make-fulldeps/manual-link/main.rs b/tests/run-make-fulldeps/manual-link/main.rs new file mode 100644 index 000000000..fe35f1f8e --- /dev/null +++ b/tests/run-make-fulldeps/manual-link/main.rs @@ -0,0 +1,5 @@ +extern crate foo; + +fn main() { + foo::foo(); +} -- cgit v1.2.3