Skip to content

Commit 1c8fe02

Browse files
authored
Unrolled build for #146588
Rollup merge of #146588 - Gelbpunkt:musl-default-linking-test, r=jieyouxu tests/run-make: Update list of statically linked musl targets All of the tier 3 targets in the list now link dynamically by default (except `mips64el-unknown-linux-muslabi64`, I apparently overlooked that one in my PR that changed this). Adjust the list of targets expected to link statically accordingly. See also #144410, which changed these targets. Target by target: - `mips64-unknown-linux-musl`: this target does not exist AFAICT - `mips64-unknown-linux-muslabi64`: updated in the linked PR - `powerpc-unknown-linux-musl`: updated in the linked PR - `powerpc-unknown-linux-muslspe`: updated in the linked PR - `powerpc64-unknown-linux-musl`: updated in the linked PR - `riscv32gc-unknown-linux-musl`: updated in the linked PR - `s390x-unknown-linux-musl`: updated in the linked PR - `thumbv7neon-unknown-linux-musleabihf`: updated in the linked PR
2 parents ba4b643 + 53b58b3 commit 1c8fe02

File tree

1 file changed

+1
-9
lines changed
  • tests/run-make/musl-default-linking

1 file changed

+1
-9
lines changed

tests/run-make/musl-default-linking/rmake.rs

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ use run_make_support::{rustc, serde_json};
44
// Per https://github.com/rust-lang/compiler-team/issues/422,
55
// we should be trying to move these targets to dynamically link
66
// musl libc by default.
7-
//@ needs-llvm-components: aarch64 arm mips powerpc riscv systemz x86
7+
//@ needs-llvm-components: aarch64 arm mips powerpc x86
88
static LEGACY_STATIC_LINKING_TARGETS: &[&'static str] = &[
99
"aarch64-unknown-linux-musl",
1010
"arm-unknown-linux-musleabi",
@@ -14,16 +14,8 @@ static LEGACY_STATIC_LINKING_TARGETS: &[&'static str] = &[
1414
"armv7-unknown-linux-musleabihf",
1515
"i586-unknown-linux-musl",
1616
"i686-unknown-linux-musl",
17-
"mips64-unknown-linux-musl",
18-
"mips64-unknown-linux-muslabi64",
1917
"mips64el-unknown-linux-muslabi64",
20-
"powerpc-unknown-linux-musl",
21-
"powerpc-unknown-linux-muslspe",
22-
"powerpc64-unknown-linux-musl",
2318
"powerpc64le-unknown-linux-musl",
24-
"riscv32gc-unknown-linux-musl",
25-
"s390x-unknown-linux-musl",
26-
"thumbv7neon-unknown-linux-musleabihf",
2719
"x86_64-unknown-linux-musl",
2820
];
2921

0 commit comments

Comments
 (0)