From 631cd5845e8de329d0e227aaa707d7ea228b8f8f Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Wed, 17 Apr 2024 14:20:29 +0200 Subject: Merging upstream version 1.70.0+dfsg1. Signed-off-by: Daniel Baumann --- tests/run-make-fulldeps/issue-15460/Makefile | 6 ------ tests/run-make-fulldeps/issue-15460/bar.rs | 4 ---- tests/run-make-fulldeps/issue-15460/foo.c | 6 ------ tests/run-make-fulldeps/issue-15460/foo.rs | 6 ------ 4 files changed, 22 deletions(-) delete mode 100644 tests/run-make-fulldeps/issue-15460/Makefile delete mode 100644 tests/run-make-fulldeps/issue-15460/bar.rs delete mode 100644 tests/run-make-fulldeps/issue-15460/foo.c delete mode 100644 tests/run-make-fulldeps/issue-15460/foo.rs (limited to 'tests/run-make-fulldeps/issue-15460') diff --git a/tests/run-make-fulldeps/issue-15460/Makefile b/tests/run-make-fulldeps/issue-15460/Makefile deleted file mode 100644 index 1648d0c0c..000000000 --- a/tests/run-make-fulldeps/issue-15460/Makefile +++ /dev/null @@ -1,6 +0,0 @@ -include ../tools.mk - -all: $(call NATIVE_STATICLIB,foo) - $(RUSTC) foo.rs -C extra-filename=-383hf8 -C prefer-dynamic - $(RUSTC) bar.rs - $(call RUN,bar) diff --git a/tests/run-make-fulldeps/issue-15460/bar.rs b/tests/run-make-fulldeps/issue-15460/bar.rs deleted file mode 100644 index e66aeb6bd..000000000 --- a/tests/run-make-fulldeps/issue-15460/bar.rs +++ /dev/null @@ -1,4 +0,0 @@ -extern crate foo; -fn main() { - unsafe { foo::foo() } -} diff --git a/tests/run-make-fulldeps/issue-15460/foo.c b/tests/run-make-fulldeps/issue-15460/foo.c deleted file mode 100644 index fdf595b57..000000000 --- a/tests/run-make-fulldeps/issue-15460/foo.c +++ /dev/null @@ -1,6 +0,0 @@ -// ignore-license - -#ifdef _WIN32 -__declspec(dllexport) -#endif -void foo() {} diff --git a/tests/run-make-fulldeps/issue-15460/foo.rs b/tests/run-make-fulldeps/issue-15460/foo.rs deleted file mode 100644 index b4eaa0b31..000000000 --- a/tests/run-make-fulldeps/issue-15460/foo.rs +++ /dev/null @@ -1,6 +0,0 @@ -#![crate_type = "dylib"] - -#[link(name = "foo", kind = "static")] -extern "C" { - pub fn foo(); -} -- cgit v1.2.3