Skip to content

Commit 49e0049

Browse files
authored
Rollup merge of rust-lang#54529 - michaelwoerister:dont-unwind-test, r=alexcrichton
aarch64-pc-windows-msvc: Don't link libpanic_unwind to libtest. This implements the suggestion from rust-lang#54190 (comment) in order to unbreak bootstrapping for the `aarch64-pc-windows-msvc` target. With this applied and using MSVC 15.8.3 for linking the bootstrap actually works and I can cross-compile a hello-world program. r? @alexcrichton
2 parents 9ea345d + f2bf92a commit 49e0049

File tree

1 file changed

+9
-1
lines changed

1 file changed

+9
-1
lines changed

src/libtest/lib.rs

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,17 @@
4545
extern crate getopts;
4646
#[cfg(any(unix, target_os = "cloudabi"))]
4747
extern crate libc;
48-
extern crate panic_unwind;
4948
extern crate term;
5049

50+
// FIXME(#54291): rustc and/or LLVM don't yet support building with panic-unwind
51+
// on aarch64-pc-windows-msvc, so we don't link libtest against
52+
// libunwind (for the time being), even though it means that
53+
// libtest won't be fully functional on this platform.
54+
//
55+
// See also: https://github.com/rust-lang/rust/issues/54190#issuecomment-422904437
56+
#[cfg(not(all(windows, target_arch = "aarch64")))]
57+
extern crate panic_unwind;
58+
5159
pub use self::TestFn::*;
5260
pub use self::ColorConfig::*;
5361
pub use self::TestResult::*;

0 commit comments

Comments
 (0)