Skip to content

Commit 5b44f80

Browse files
committed
rewrite and rename issue-36710 to rmake
1 parent 8f641b1 commit 5b44f80

File tree

5 files changed

+27
-20
lines changed

5 files changed

+27
-20
lines changed

Diff for: src/tools/tidy/src/allowed_run_make_makefiles.txt

-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ run-make/emit-to-stdout/Makefile
1111
run-make/extern-fn-reachable/Makefile
1212
run-make/foreign-exceptions/Makefile
1313
run-make/incr-add-rust-src-component/Makefile
14-
run-make/issue-36710/Makefile
1514
run-make/issue-84395-lto-embed-bitcode/Makefile
1615
run-make/issue-88756-default-output/Makefile
1716
run-make/jobserver-error/Makefile
File renamed without changes.
File renamed without changes.

Diff for: tests/run-make/cpp-global-destructors/rmake.rs

+27
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
// Some start files were missed when originally writing the logic to swap in musl start files.
2+
// This caused #36710. After the fix in #50105, this test checks that linking to C++ code
3+
// with global destructors works.
4+
// See https://github.com/rust-lang/rust/pull/50105
5+
6+
//@ ignore-cross-compile
7+
// Reason: the compiled binary is executed
8+
9+
// FIXME(Oneirical): are these really necessary? This test is supposed to test a musl
10+
// bug... and it ignores musl? This wasn't part of the original test at its creation, which
11+
// had no ignores.
12+
13+
//# ignore-none no-std is not supported
14+
//# ignore-wasm32 FIXME: don't attempt to compile C++ to WASM
15+
//# ignore-wasm64 FIXME: don't attempt to compile C++ to WASM
16+
//# ignore-nvptx64-nvidia-cuda FIXME: can't find crate for `std`
17+
//# ignore-musl FIXME: this makefile needs teaching how to use a musl toolchain
18+
//# (see dist-i586-gnu-i586-i686-musl Dockerfile)
19+
//# ignore-sgx
20+
21+
use run_make_support::{build_native_static_lib_cxx, run, rustc};
22+
23+
fn main() {
24+
build_native_static_lib_cxx("foo");
25+
rustc().input("foo.rs").arg("-lfoo").extra_rs_cxx_flags().run();
26+
run("foo");
27+
}

Diff for: tests/run-make/issue-36710/Makefile

-19
This file was deleted.

0 commit comments

Comments
 (0)