Skip to content

Commit

Permalink
Support illumos target
Browse files Browse the repository at this point in the history
Related to taiki-e#2
  • Loading branch information
zeeshanlakhani committed Jul 12, 2024
1 parent 5512f65 commit c436983
Show file tree
Hide file tree
Showing 4 changed files with 24 additions and 4 deletions.
7 changes: 7 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,12 @@ jobs:
- target: x86_64-unknown-netbsd
- target: x86_64-unknown-netbsd@9

# Illumos
# rustup target list | grep -e '-illumos'
# rustc --print target-list | grep -e '-illumos'
# - target: aarch64-unknown-illumos # tier3 (not yet supported)
- target: x86_64-unknown-illumos

# WASI
# rustup target list | grep -e '-wasi'
# rustc --print target-list | grep -e '-wasi'
Expand Down Expand Up @@ -287,6 +293,7 @@ jobs:
- aarch64-linux-android
- x86_64-unknown-freebsd
- x86_64-unknown-netbsd
- x86_64-unknown-illumos
- wasm32-wasip1
- x86_64-pc-windows-gnu
- x86_64-pc-windows-gnullvm
Expand Down
13 changes: 13 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ GitHub Action for setup toolchains for cross compilation and cross testing for R
- [Android](#android)
- [FreeBSD](#freebsd)
- [NetBSD](#netbsd)
- [illumos](#illumos)
- [WASI](#wasi)
- [Windows (MinGW)](#windows-mingw)
- [Windows (LLVM MinGW)](#windows-llvm-mingw)
Expand Down Expand Up @@ -376,6 +377,18 @@ You can select/pin the OS version by using `@` syntax in `target` option. For ex

Only specifying a major version is supported.

### illumos

| libc | GCC | clang | C++ | test |
| ---- | --- | ----- | --- | ---- |
| solaris 2.10 | 8.5.0 | host | ✓ (libstdc++) | |

**Supported targets:**

| target | host | note |
| ------ | ---- | ---- |
| `x86_64-unknown-illumos` | x86_64 Linux (any libc) | |

### WASI

| libc | Clang | C++ | test |
Expand Down
6 changes: 3 additions & 3 deletions main.sh
Original file line number Diff line number Diff line change
Expand Up @@ -498,7 +498,7 @@ EOF
install_rust_cross_toolchain
install_llvm
;;
*-netbsd*)
*-netbsd* | *-illumos*)
install_rust_cross_toolchain
;;
*-wasi*)
Expand Down Expand Up @@ -654,8 +654,8 @@ EOF
*) bail "unrecognized runner '${runner}'" ;;
esac
;;
*-freebsd* | *-netbsd*)
# Runners for BSDs are not supported yet.
*-freebsd* | *-netbsd* | *-illumos*)
# Runners for BSDs and illumos are not supported yet.
# We are currently testing the uploaded artifacts manually with Cirrus CI and local VM.
# https://cirrus-ci.org/guide/FreeBSD
case "${runner}" in
Expand Down
2 changes: 1 addition & 1 deletion tools/ci/test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ esac
skip_run() {
case "${target}" in
# x86_64h-apple-darwin is also x86_64 but build-only due to the CPU of GitHub-provided macOS runners is older than haswell.
*-freebsd* | *-netbsd* | x86_64h-apple-darwin | aarch64*-windows-msvc) return 0 ;;
*-freebsd* | *-netbsd* | *-illumos* | x86_64h-apple-darwin | aarch64*-windows-msvc) return 0 ;;
aarch64*-darwin* | arm64*-darwin*)
case "$(uname -m)" in
aarch64 | arm64) ;;
Expand Down

0 comments on commit c436983

Please sign in to comment.