rust-lang · May 29, 2024
diff --git a/‎src/tools/tidy/src/allowed_run_make_makefiles.txt
-2 b/‎src/tools/tidy/src/allowed_run_make_makefiles.txt
-2
diff --git a/‎tests/run-make/issue-37893/Makefile
-5 b/‎tests/run-make/issue-37893/Makefile
-5
diff --git a/‎tests/run-make/issue-37893/a.rs ‎tests/run-make/proc-macro-init-order/a.rs b/‎tests/run-make/issue-37893/a.rs ‎tests/run-make/proc-macro-init-order/a.rs
diff --git a/‎tests/run-make/issue-37893/b.rs ‎tests/run-make/proc-macro-init-order/b.rs b/‎tests/run-make/issue-37893/b.rs ‎tests/run-make/proc-macro-init-order/b.rs
diff --git a/‎tests/run-make/issue-37893/c.rs ‎tests/run-make/proc-macro-init-order/c.rs b/‎tests/run-make/issue-37893/c.rs ‎tests/run-make/proc-macro-init-order/c.rs
diff --git a/‎tests/run-make/proc-macro-init-order/rmake.rs
+15 b/‎tests/run-make/proc-macro-init-order/rmake.rs
+15
diff --git a/‎tests/ui/errors/pic-linker.rs
+1-1 b/‎tests/ui/errors/pic-linker.rs
+1-1
diff --git a/‎tests/ui/imports/auxiliary/simple-dylib.rs
+1-1 b/‎tests/ui/imports/auxiliary/simple-dylib.rs
+1-1
diff --git a/‎tests/ui/imports/simple-dylib-import.rs
+1-1 b/‎tests/ui/imports/simple-dylib-import.rs
+1-1
@@ -72,7 +72,6 @@ run-make/forced-unwind-terminate-pof/Makefile
 run-make/foreign-double-unwind/Makefile
 run-make/foreign-exceptions/Makefile
 run-make/foreign-rust-exceptions/Makefile
-run-make/fpic/Makefile
 run-make/glibc-staticlib-args/Makefile
 run-make/inaccessible-temp-dir/Makefile
 run-make/include_bytes_deps/Makefile
@@ -103,7 +102,6 @@ run-make/issue-33329/Makefile
 run-make/issue-35164/Makefile
 run-make/issue-36710/Makefile
 run-make/issue-37839/Makefile
-run-make/issue-37893/Makefile
 run-make/issue-40535/Makefile
 run-make/issue-47384/Makefile
 run-make/issue-47551/Makefile
 
@@ -0,0 +1,15 @@
+// a.rs is a procedural macro crate, on which b.rs and c.rs depend. A now
+// patched bug caused a compilation failure if the proc-macro crate was
+// initialized with its dependents in this exact order. This test checks
+// that compilation succeeds even when initialization is done in this order.
+// See https://github.com/rust-lang/rust/issues/37893
+
+//@ ignore-cross-compile
+
+use run_make_support::rustc;
+
+fn main() {
+    rustc().input("a.rs").run();
+    rustc().input("b.rs").run();
+    rustc().input("c.rs").run();
+}
@@ -6,7 +6,7 @@
 //@ ignore-macos
 //@ ignore-cross-compile
 
-//@ compile-flags -Clink-args=-Wl,-z,text
+//@ compile-flags: -Clink-args=-Wl,-z,text
 //@ run-pass
 
 fn main() {}
@@ -1,4 +1,4 @@
-//@ compile-flags --crate-type=dylib -Cprefer-dynamic
+//@ compile-flags: -Cprefer-dynamic
 
 #![crate_type = "dylib"]
 pub fn bar() {}
@@ -2,7 +2,7 @@
 // on the dynamic library simple-dylib.rs. If the test passes,
 // dylibs can be built and linked into another file successfully..
 
-//@ aux-crate: simple-dylib.rs
+//@ aux-crate:bar=simple-dylib.rs
 //@ run-pass
 
 extern crate bar;