Skip to content

Commit e313587

Browse files
committed
Auto merge of #2093 - JohnTitor:solaris-default-target, r=JohnTitor
Replace `x86_64-sun-solaris` with `x86_64-pc-solaris` Address the changes by rust-lang/rust#82216. I didn't add `x86_64-sun-solaris` as it's now deprecated. r? `@ghost`
2 parents a6dc5bc + d96c9a2 commit e313587

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

ci/build.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,6 @@ RUST_GT_1_19_LINUX_TARGETS="\
130130
aarch64-unknown-linux-musl \
131131
sparcv9-sun-solaris \
132132
wasm32-unknown-unknown \
133-
x86_64-sun-solaris \
134133
"
135134
RUST_GT_1_24_LINUX_TARGETS="\
136135
i586-unknown-linux-musl \
@@ -145,6 +144,7 @@ riscv64gc-unknown-linux-gnu \
145144
wasm32-wasi \
146145
x86_64-fortanix-unknown-sgx \
147146
x86_64-fuchsia \
147+
x86_64-pc-solaris \
148148
x86_64-pc-windows-gnu \
149149
x86_64-unknown-illumos \
150150
x86_64-unknown-linux-gnux32 \

ci/semver.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ x86_64-unknown-freebsd \
3939
x86_64-unknown-linux-gnu \
4040
x86_64-unknown-linux-musl \
4141
x86_64-unknown-netbsd \
42-
x86_64-sun-solaris \
42+
x86_64-pc-solaris \
4343
x86_64-fuchsia \
4444
x86_64-pc-windows-gnu \
4545
x86_64-unknown-linux-gnux32 \

src/unix/solarish/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2551,7 +2551,7 @@ extern "C" {
25512551

25522552
// The epoll functions are actually only present on illumos. However,
25532553
// there are things using epoll on illumos (built using the
2554-
// x86_64-sun-solaris target) which would break until the illumos target is
2554+
// x86_64-pc-solaris target) which would break until the illumos target is
25552555
// present in rustc.
25562556
pub fn epoll_pwait(
25572557
epfd: ::c_int,

0 commit comments

Comments
 (0)