Skip to content

Commit 17cc521

Browse files
committed
Auto merge of #2406 - asomers:fbsd12-default, r=JohnTitor
Raise libc's FreeBSD ABI to 12 FreeBSD 11 will be EoL on 30-Sept-2021. Update libc's ABI to the minimum supported version of FreeBSD.
2 parents 4d2b981 + d3f5a15 commit 17cc521

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

build.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ fn main() {
6060
}
6161

6262
// The ABI of libc used by libstd is backward compatible with FreeBSD 10.
63-
// The ABI of libc from crates.io is backward compatible with FreeBSD 11.
63+
// The ABI of libc from crates.io is backward compatible with FreeBSD 12.
6464
//
6565
// On CI, we detect the actual FreeBSD version and match its ABI exactly,
6666
// running tests to ensure that the ABI is correct.
@@ -70,7 +70,7 @@ fn main() {
7070
Some(12) if libc_ci => set_cfg("freebsd12"),
7171
Some(13) if libc_ci => set_cfg("freebsd13"),
7272
Some(14) if libc_ci => set_cfg("freebsd14"),
73-
Some(_) | None => set_cfg("freebsd11"),
73+
Some(_) | None => set_cfg("freebsd12"),
7474
}
7575

7676
match emcc_version_code() {

0 commit comments

Comments
 (0)