From 64d98f8ee037282c35007b64c2649055c56af1db Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Wed, 17 Apr 2024 14:19:03 +0200 Subject: Merging upstream version 1.68.2+dfsg1. Signed-off-by: Daniel Baumann --- tests/run-make-fulldeps/issue-11908/Makefile | 21 +++++++++++++++++++++ tests/run-make-fulldeps/issue-11908/bar.rs | 3 +++ tests/run-make-fulldeps/issue-11908/foo.rs | 1 + 3 files changed, 25 insertions(+) create mode 100644 tests/run-make-fulldeps/issue-11908/Makefile create mode 100644 tests/run-make-fulldeps/issue-11908/bar.rs create mode 100644 tests/run-make-fulldeps/issue-11908/foo.rs (limited to 'tests/run-make-fulldeps/issue-11908') diff --git a/tests/run-make-fulldeps/issue-11908/Makefile b/tests/run-make-fulldeps/issue-11908/Makefile new file mode 100644 index 000000000..47005537e --- /dev/null +++ b/tests/run-make-fulldeps/issue-11908/Makefile @@ -0,0 +1,21 @@ +# This test ensures that if you have the same rlib or dylib at two locations +# in the same path that you don't hit an assertion in the compiler. +# +# Note that this relies on `liburl` to be in the path somewhere else, +# and then our aux-built libraries will collide with liburl (they have +# the same version listed) + +include ../tools.mk + +all: + mkdir $(TMPDIR)/other + $(RUSTC) foo.rs --crate-type=dylib -C prefer-dynamic + mv $(call DYLIB,foo) $(TMPDIR)/other + $(RUSTC) foo.rs --crate-type=dylib -C prefer-dynamic + $(RUSTC) bar.rs -L $(TMPDIR)/other + rm -rf $(TMPDIR) + mkdir -p $(TMPDIR)/other + $(RUSTC) foo.rs --crate-type=rlib + mv $(TMPDIR)/libfoo.rlib $(TMPDIR)/other + $(RUSTC) foo.rs --crate-type=rlib + $(RUSTC) bar.rs -L $(TMPDIR)/other diff --git a/tests/run-make-fulldeps/issue-11908/bar.rs b/tests/run-make-fulldeps/issue-11908/bar.rs new file mode 100644 index 000000000..bb7b36c49 --- /dev/null +++ b/tests/run-make-fulldeps/issue-11908/bar.rs @@ -0,0 +1,3 @@ +extern crate foo; + +fn main() {} diff --git a/tests/run-make-fulldeps/issue-11908/foo.rs b/tests/run-make-fulldeps/issue-11908/foo.rs new file mode 100644 index 000000000..82b2dfe9f --- /dev/null +++ b/tests/run-make-fulldeps/issue-11908/foo.rs @@ -0,0 +1 @@ +#![crate_name = "foo"] -- cgit v1.2.3