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/c-static-dylib/Makefile | 9 --------- tests/run-make-fulldeps/c-static-dylib/bar.rs | 5 ----- tests/run-make-fulldeps/c-static-dylib/cfoo.c | 1 - tests/run-make-fulldeps/c-static-dylib/foo.rs | 10 ---------- 4 files changed, 25 deletions(-) delete mode 100644 tests/run-make-fulldeps/c-static-dylib/Makefile delete mode 100644 tests/run-make-fulldeps/c-static-dylib/bar.rs delete mode 100644 tests/run-make-fulldeps/c-static-dylib/cfoo.c delete mode 100644 tests/run-make-fulldeps/c-static-dylib/foo.rs (limited to 'tests/run-make-fulldeps/c-static-dylib') diff --git a/tests/run-make-fulldeps/c-static-dylib/Makefile b/tests/run-make-fulldeps/c-static-dylib/Makefile deleted file mode 100644 index 5b78005e3..000000000 --- a/tests/run-make-fulldeps/c-static-dylib/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -include ../tools.mk - -all: $(call NATIVE_STATICLIB,cfoo) - $(RUSTC) foo.rs -C prefer-dynamic - $(RUSTC) bar.rs - rm $(call NATIVE_STATICLIB,cfoo) - $(call RUN,bar) - $(call REMOVE_DYLIBS,foo) - $(call FAIL,bar) diff --git a/tests/run-make-fulldeps/c-static-dylib/bar.rs b/tests/run-make-fulldeps/c-static-dylib/bar.rs deleted file mode 100644 index b8c798ffd..000000000 --- a/tests/run-make-fulldeps/c-static-dylib/bar.rs +++ /dev/null @@ -1,5 +0,0 @@ -extern crate foo; - -fn main() { - foo::rsfoo(); -} diff --git a/tests/run-make-fulldeps/c-static-dylib/cfoo.c b/tests/run-make-fulldeps/c-static-dylib/cfoo.c deleted file mode 100644 index 9fe07f82f..000000000 --- a/tests/run-make-fulldeps/c-static-dylib/cfoo.c +++ /dev/null @@ -1 +0,0 @@ -int foo() { return 0; } diff --git a/tests/run-make-fulldeps/c-static-dylib/foo.rs b/tests/run-make-fulldeps/c-static-dylib/foo.rs deleted file mode 100644 index 1e8af4d44..000000000 --- a/tests/run-make-fulldeps/c-static-dylib/foo.rs +++ /dev/null @@ -1,10 +0,0 @@ -#![crate_type = "dylib"] - -#[link(name = "cfoo", kind = "static")] -extern "C" { - fn foo(); -} - -pub fn rsfoo() { - unsafe { foo() } -} -- cgit v1.2.3