summaryrefslogtreecommitdiffstats
path: root/tests/run-make/extern-multiple-copies
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-17 12:20:39 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-17 12:20:39 +0000
commit1376c5a617be5c25655d0d7cb63e3beaa5a6e026 (patch)
tree3bb8d61aee02bc7a15eab3f36e3b921afc2075d0 /tests/run-make/extern-multiple-copies
parentReleasing progress-linux version 1.69.0+dfsg1-1~progress7.99u1. (diff)
downloadrustc-1376c5a617be5c25655d0d7cb63e3beaa5a6e026.tar.xz
rustc-1376c5a617be5c25655d0d7cb63e3beaa5a6e026.zip
Merging upstream version 1.70.0+dfsg1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to '')
-rw-r--r--tests/run-make/extern-multiple-copies/Makefile (renamed from tests/run-make-fulldeps/extern-multiple-copies/Makefile)1
-rw-r--r--tests/run-make/extern-multiple-copies/bar.rs (renamed from tests/run-make-fulldeps/extern-multiple-copies/bar.rs)0
-rw-r--r--tests/run-make/extern-multiple-copies/foo1.rs (renamed from tests/run-make-fulldeps/extern-multiple-copies/foo1.rs)0
-rw-r--r--tests/run-make/extern-multiple-copies/foo2.rs (renamed from tests/run-make-fulldeps/extern-multiple-copies/foo2.rs)0
-rw-r--r--tests/run-make/extern-multiple-copies2/Makefile (renamed from tests/run-make-fulldeps/extern-multiple-copies2/Makefile)1
-rw-r--r--tests/run-make/extern-multiple-copies2/bar.rs (renamed from tests/run-make-fulldeps/extern-multiple-copies2/bar.rs)0
-rw-r--r--tests/run-make/extern-multiple-copies2/foo1.rs (renamed from tests/run-make-fulldeps/extern-multiple-copies2/foo1.rs)0
-rw-r--r--tests/run-make/extern-multiple-copies2/foo2.rs (renamed from tests/run-make-fulldeps/extern-multiple-copies2/foo2.rs)0
8 files changed, 2 insertions, 0 deletions
diff --git a/tests/run-make-fulldeps/extern-multiple-copies/Makefile b/tests/run-make/extern-multiple-copies/Makefile
index 00668a6bc..b0b84278e 100644
--- a/tests/run-make-fulldeps/extern-multiple-copies/Makefile
+++ b/tests/run-make/extern-multiple-copies/Makefile
@@ -1,3 +1,4 @@
+# ignore-cross-compile
include ../tools.mk
all:
diff --git a/tests/run-make-fulldeps/extern-multiple-copies/bar.rs b/tests/run-make/extern-multiple-copies/bar.rs
index c6b3595f6..c6b3595f6 100644
--- a/tests/run-make-fulldeps/extern-multiple-copies/bar.rs
+++ b/tests/run-make/extern-multiple-copies/bar.rs
diff --git a/tests/run-make-fulldeps/extern-multiple-copies/foo1.rs b/tests/run-make/extern-multiple-copies/foo1.rs
index c1bfaa6ca..c1bfaa6ca 100644
--- a/tests/run-make-fulldeps/extern-multiple-copies/foo1.rs
+++ b/tests/run-make/extern-multiple-copies/foo1.rs
diff --git a/tests/run-make-fulldeps/extern-multiple-copies/foo2.rs b/tests/run-make/extern-multiple-copies/foo2.rs
index c1bfaa6ca..c1bfaa6ca 100644
--- a/tests/run-make-fulldeps/extern-multiple-copies/foo2.rs
+++ b/tests/run-make/extern-multiple-copies/foo2.rs
diff --git a/tests/run-make-fulldeps/extern-multiple-copies2/Makefile b/tests/run-make/extern-multiple-copies2/Makefile
index 84de2ebf3..708b1c1b5 100644
--- a/tests/run-make-fulldeps/extern-multiple-copies2/Makefile
+++ b/tests/run-make/extern-multiple-copies2/Makefile
@@ -1,3 +1,4 @@
+# ignore-cross-compile
include ../tools.mk
all:
diff --git a/tests/run-make-fulldeps/extern-multiple-copies2/bar.rs b/tests/run-make/extern-multiple-copies2/bar.rs
index b3088152d..b3088152d 100644
--- a/tests/run-make-fulldeps/extern-multiple-copies2/bar.rs
+++ b/tests/run-make/extern-multiple-copies2/bar.rs
diff --git a/tests/run-make-fulldeps/extern-multiple-copies2/foo1.rs b/tests/run-make/extern-multiple-copies2/foo1.rs
index 4c778e52f..4c778e52f 100644
--- a/tests/run-make-fulldeps/extern-multiple-copies2/foo1.rs
+++ b/tests/run-make/extern-multiple-copies2/foo1.rs
diff --git a/tests/run-make-fulldeps/extern-multiple-copies2/foo2.rs b/tests/run-make/extern-multiple-copies2/foo2.rs
index 2be103507..2be103507 100644
--- a/tests/run-make-fulldeps/extern-multiple-copies2/foo2.rs
+++ b/tests/run-make/extern-multiple-copies2/foo2.rs