File tree Expand file tree Collapse file tree 3 files changed +32
-3
lines changed Expand file tree Collapse file tree 3 files changed +32
-3
lines changed Original file line number Diff line number Diff line change @@ -188,6 +188,33 @@ jobs:
188
188
- name : Execute run-docker.sh
189
189
run : sh ./ci/run-docker.sh ${{ matrix.target }}
190
190
191
+ solaris :
192
+ name : Solaris
193
+ runs-on : ubuntu-latest
194
+ strategy :
195
+ fail-fast : true
196
+ matrix :
197
+ target :
198
+ - x86_64-pc-solaris
199
+ steps :
200
+ - uses : actions/checkout@v4
201
+ - name : test on Solaris
202
+ uses : vmactions/solaris-vm@v1
203
+ with :
204
+ release : " 11.4-gcc"
205
+ usesh : true
206
+ mem : 4096
207
+ copyback : false
208
+ prepare : |
209
+ source <(curl -s https://raw.githubusercontent.com/psumbera/solaris-rust/refs/heads/main/sh.rust-web-install)
210
+ echo "~~~~ rustc --version ~~~~"
211
+ rustc --version
212
+ echo "~~~~ Solaris-version ~~~~"
213
+ uname -a
214
+ run : |
215
+ export PATH=$HOME/.rust_solaris/bin:$PATH
216
+ bash ./ci/run.sh ${{ matrix.target }}
217
+
191
218
check_cfg :
192
219
name : " Check #[cfg]s"
193
220
runs-on : ubuntu-22.04
@@ -208,6 +235,7 @@ jobs:
208
235
- docker_linux_tier2
209
236
- macos
210
237
- windows
238
+ - solaris
211
239
- style_check
212
240
- build_channels_linux
213
241
- build_channels_macos
Original file line number Diff line number Diff line change @@ -1485,6 +1485,9 @@ cfg_if! {
1485
1485
all( target_os = "macos" , target_arch = "x86" ) ,
1486
1486
link_name = "confstr$UNIX2003"
1487
1487
) ]
1488
+ #[ cfg_attr( target_os = "solaris" ,
1489
+ link_name = "__confstr_xpg7"
1490
+ ) ]
1488
1491
pub fn confstr( name: :: c_int, buf: * mut :: c_char, len: :: size_t) -> :: size_t;
1489
1492
}
1490
1493
}
Original file line number Diff line number Diff line change @@ -89,9 +89,7 @@ s_no_extra_traits! {
89
89
#[ cfg( target_os = "solaris" ) ]
90
90
pub uc_xrs: solaris:: xrs_t,
91
91
#[ cfg( target_os = "solaris" ) ]
92
- pub uc_lwpid: :: c_uint,
93
- #[ cfg( target_os = "solaris" ) ]
94
- pub uc_filler: [ :: c_long; 2 ] ,
92
+ pub uc_filler: [ :: c_long; 3 ] ,
95
93
}
96
94
}
97
95
You can’t perform that action at this time.
0 commit comments