From 1376c5a617be5c25655d0d7cb63e3beaa5a6e026 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Wed, 17 Apr 2024 14:20:39 +0200 Subject: Merging upstream version 1.70.0+dfsg1. Signed-off-by: Daniel Baumann --- tests/run-make-fulldeps/static-dylib-by-default/Makefile | 16 ---------------- tests/run-make-fulldeps/static-dylib-by-default/bar.rs | 8 -------- tests/run-make-fulldeps/static-dylib-by-default/foo.rs | 4 ---- tests/run-make-fulldeps/static-dylib-by-default/main.c | 6 ------ 4 files changed, 34 deletions(-) delete mode 100644 tests/run-make-fulldeps/static-dylib-by-default/Makefile delete mode 100644 tests/run-make-fulldeps/static-dylib-by-default/bar.rs delete mode 100644 tests/run-make-fulldeps/static-dylib-by-default/foo.rs delete mode 100644 tests/run-make-fulldeps/static-dylib-by-default/main.c (limited to 'tests/run-make-fulldeps/static-dylib-by-default') diff --git a/tests/run-make-fulldeps/static-dylib-by-default/Makefile b/tests/run-make-fulldeps/static-dylib-by-default/Makefile deleted file mode 100644 index eedd0b320..000000000 --- a/tests/run-make-fulldeps/static-dylib-by-default/Makefile +++ /dev/null @@ -1,16 +0,0 @@ -include ../tools.mk - -TO_LINK := $(call DYLIB,bar) -ifdef IS_MSVC -LINK_ARG = $(TO_LINK:dll=dll.lib) -else -LINK_ARG = $(TO_LINK) -endif - -all: - $(RUSTC) foo.rs - $(RUSTC) bar.rs - $(CC) main.c $(call OUT_EXE,main) $(LINK_ARG) $(EXTRACFLAGS) - rm $(TMPDIR)/*.rlib - rm $(call DYLIB,foo) - $(call RUN,main) diff --git a/tests/run-make-fulldeps/static-dylib-by-default/bar.rs b/tests/run-make-fulldeps/static-dylib-by-default/bar.rs deleted file mode 100644 index 14421165e..000000000 --- a/tests/run-make-fulldeps/static-dylib-by-default/bar.rs +++ /dev/null @@ -1,8 +0,0 @@ -#![crate_type = "dylib"] - -extern crate foo; - -#[no_mangle] -pub extern "C" fn bar() { - foo::foo(); -} diff --git a/tests/run-make-fulldeps/static-dylib-by-default/foo.rs b/tests/run-make-fulldeps/static-dylib-by-default/foo.rs deleted file mode 100644 index 7ebec8720..000000000 --- a/tests/run-make-fulldeps/static-dylib-by-default/foo.rs +++ /dev/null @@ -1,4 +0,0 @@ -#![crate_type = "rlib"] -#![crate_type = "dylib"] - -pub fn foo() {} diff --git a/tests/run-make-fulldeps/static-dylib-by-default/main.c b/tests/run-make-fulldeps/static-dylib-by-default/main.c deleted file mode 100644 index 5f7f2c27c..000000000 --- a/tests/run-make-fulldeps/static-dylib-by-default/main.c +++ /dev/null @@ -1,6 +0,0 @@ -extern void bar(); - -int main() { - bar(); - return 0; -} -- cgit v1.2.3