Merging upstream version 1.68.2+dfsg1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

4 files changed, 28 insertions, 0 deletions

diff --git a/tests/run-make-fulldeps/symlinked-extern/Makefile b/tests/run-make-fulldeps/symlinked-extern/Makefile
new file mode 100644
index 000000000..058f43e85
--- /dev/null
+++ b/tests/run-make-fulldeps/symlinked-extern/Makefile
@@ -0,0 +1,11 @@
+include ../tools.mk
+
+# ignore-windows
+# `ln` is actually `cp` on msys.
+
+all:
+	$(RUSTC) foo.rs
+	mkdir -p $(TMPDIR)/other
+	ln -nsf $(TMPDIR)/libfoo.rlib $(TMPDIR)/other
+	$(RUSTC) bar.rs -L $(TMPDIR)
+	$(RUSTC) baz.rs --extern foo=$(TMPDIR)/other/libfoo.rlib  -L $(TMPDIR)
diff --git a/tests/run-make-fulldeps/symlinked-extern/bar.rs b/tests/run-make-fulldeps/symlinked-extern/bar.rs
new file mode 100644
index 000000000..cd9c959d5
--- /dev/null
+++ b/tests/run-make-fulldeps/symlinked-extern/bar.rs
@@ -0,0 +1,6 @@
+#![crate_type = "rlib"]
+
+extern crate foo;
+
+pub fn bar(_s: foo::S) {
+}
diff --git a/tests/run-make-fulldeps/symlinked-extern/baz.rs b/tests/run-make-fulldeps/symlinked-extern/baz.rs
new file mode 100644
index 000000000..cd433a3ac
--- /dev/null
+++ b/tests/run-make-fulldeps/symlinked-extern/baz.rs
@@ -0,0 +1,6 @@
+extern crate bar;
+extern crate foo;
+
+fn main() {
+    bar::bar(foo::foo());
+}
diff --git a/tests/run-make-fulldeps/symlinked-extern/foo.rs b/tests/run-make-fulldeps/symlinked-extern/foo.rs
new file mode 100644
index 000000000..c00700b8c
--- /dev/null
+++ b/tests/run-make-fulldeps/symlinked-extern/foo.rs
@@ -0,0 +1,5 @@
+#![crate_type = "rlib"]
+
+pub struct S;
+
+pub fn foo() -> S { S }