summaryrefslogtreecommitdiffstats
path: root/tests/run-make-fulldeps/extern-flag-pathless
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-17 12:20:29 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-17 12:20:29 +0000
commit631cd5845e8de329d0e227aaa707d7ea228b8f8f (patch)
treea1b87c8f8cad01cf18f7c5f57a08f102771ed303 /tests/run-make-fulldeps/extern-flag-pathless
parentAdding debian version 1.69.0+dfsg1-1. (diff)
downloadrustc-631cd5845e8de329d0e227aaa707d7ea228b8f8f.tar.xz
rustc-631cd5845e8de329d0e227aaa707d7ea228b8f8f.zip
Merging upstream version 1.70.0+dfsg1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'tests/run-make-fulldeps/extern-flag-pathless')
-rw-r--r--tests/run-make-fulldeps/extern-flag-pathless/Makefile18
-rw-r--r--tests/run-make-fulldeps/extern-flag-pathless/bar-dynamic.rs3
-rw-r--r--tests/run-make-fulldeps/extern-flag-pathless/bar-static.rs3
-rw-r--r--tests/run-make-fulldeps/extern-flag-pathless/foo.rs3
4 files changed, 0 insertions, 27 deletions
diff --git a/tests/run-make-fulldeps/extern-flag-pathless/Makefile b/tests/run-make-fulldeps/extern-flag-pathless/Makefile
deleted file mode 100644
index 0f23815b6..000000000
--- a/tests/run-make-fulldeps/extern-flag-pathless/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-include ../tools.mk
-
-# Test mixing pathless --extern with paths.
-
-all:
- $(RUSTC) bar-static.rs --crate-name=bar --crate-type=rlib
- $(RUSTC) bar-dynamic.rs --crate-name=bar --crate-type=dylib -C prefer-dynamic
- # rlib preferred over dylib
- $(RUSTC) foo.rs --extern bar
- $(call RUN,foo) | $(CGREP) 'static'
- $(RUSTC) foo.rs --extern bar=$(TMPDIR)/libbar.rlib --extern bar
- $(call RUN,foo) | $(CGREP) 'static'
- # explicit --extern overrides pathless
- $(RUSTC) foo.rs --extern bar=$(call DYLIB,bar) --extern bar
- $(call RUN,foo) | $(CGREP) 'dynamic'
- # prefer-dynamic does what it says
- $(RUSTC) foo.rs --extern bar -C prefer-dynamic
- $(call RUN,foo) | $(CGREP) 'dynamic'
diff --git a/tests/run-make-fulldeps/extern-flag-pathless/bar-dynamic.rs b/tests/run-make-fulldeps/extern-flag-pathless/bar-dynamic.rs
deleted file mode 100644
index e2d68d517..000000000
--- a/tests/run-make-fulldeps/extern-flag-pathless/bar-dynamic.rs
+++ /dev/null
@@ -1,3 +0,0 @@
-pub fn f() {
- println!("dynamic");
-}
diff --git a/tests/run-make-fulldeps/extern-flag-pathless/bar-static.rs b/tests/run-make-fulldeps/extern-flag-pathless/bar-static.rs
deleted file mode 100644
index 240d8bde4..000000000
--- a/tests/run-make-fulldeps/extern-flag-pathless/bar-static.rs
+++ /dev/null
@@ -1,3 +0,0 @@
-pub fn f() {
- println!("static");
-}
diff --git a/tests/run-make-fulldeps/extern-flag-pathless/foo.rs b/tests/run-make-fulldeps/extern-flag-pathless/foo.rs
deleted file mode 100644
index 1ea64da7d..000000000
--- a/tests/run-make-fulldeps/extern-flag-pathless/foo.rs
+++ /dev/null
@@ -1,3 +0,0 @@
-fn main() {
- bar::f();
-}