Skip to content

Commit 4c0a7e5

Browse files
committed
Auto merge of #1966 - JohnTitor:freebsd-12-2, r=JohnTitor
Update to FreeBSD 12.2 https://www.freebsd.org/releases/12.2R/announce.html
2 parents 05dfed5 + b9bf6d1 commit 4c0a7e5

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed

.cirrus.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ task:
1616
task:
1717
name: nightly x86_64-unknown-freebsd-12
1818
freebsd_instance:
19-
image: freebsd-12-1-release-amd64
19+
image: freebsd-12-2-release-amd64
2020
setup_script:
2121
- pkg install -y curl
2222
- curl https://sh.rustup.rs -sSf --output rustup.sh

libc-test/build.rs

+5
Original file line numberDiff line numberDiff line change
@@ -1858,6 +1858,11 @@ fn test_freebsd(target: &str) {
18581858
// commit/06b00ceaa914a3907e4e27bad924f44612bae1d7
18591859
"MINCORE_SUPER" if Some(13) == freebsd_ver => true,
18601860

1861+
// This was increased to 97 in FreeBSD 12.2 and 13.
1862+
// https://github.com/freebsd/freebsd/
1863+
// commit/72a21ba0f62da5e86a1c0b462aeb3f5ff849a1b7
1864+
"ELAST" if Some(12) == freebsd_ver => true,
1865+
18611866
_ => false,
18621867
}
18631868
});

0 commit comments

Comments
 (0)