Commit 971645b 1 parent 3a1582f commit 971645b Copy full SHA for 971645b
File tree 3 files changed +32
-3
lines changed
3 files changed +32
-3
lines changed Original file line number Diff line number Diff line change @@ -194,6 +194,33 @@ jobs:
194
194
- name : Execute run-docker.sh
195
195
run : sh ./ci/run-docker.sh ${{ matrix.target }}
196
196
197
+ solaris :
198
+ name : Solaris
199
+ runs-on : ubuntu-latest
200
+ strategy :
201
+ fail-fast : true
202
+ matrix :
203
+ target :
204
+ - x86_64-pc-solaris
205
+ steps :
206
+ - uses : actions/checkout@v4
207
+ - name : test on Solaris
208
+ uses : vmactions/solaris-vm@v1
209
+ with :
210
+ release : " 11.4-gcc"
211
+ usesh : true
212
+ mem : 4096
213
+ copyback : false
214
+ prepare : |
215
+ source <(curl -s https://raw.githubusercontent.com/psumbera/solaris-rust/refs/heads/main/sh.rust-web-install)
216
+ echo "~~~~ rustc --version ~~~~"
217
+ rustc --version
218
+ echo "~~~~ Solaris-version ~~~~"
219
+ uname -a
220
+ run : |
221
+ export PATH=$HOME/.rust_solaris/bin:$PATH
222
+ bash ./ci/run.sh ${{ matrix.target }}
223
+
197
224
check_cfg :
198
225
name : " Check #[cfg]s"
199
226
runs-on : ubuntu-22.04
@@ -214,6 +241,7 @@ jobs:
214
241
- docker_linux_tier2
215
242
- macos
216
243
- windows
244
+ - solaris
217
245
- style_check
218
246
- build_channels_linux
219
247
- build_channels_macos
Original file line number Diff line number Diff line change @@ -1492,6 +1492,9 @@ cfg_if! {
1492
1492
all( target_os = "macos" , target_arch = "x86" ) ,
1493
1493
link_name = "confstr$UNIX2003"
1494
1494
) ]
1495
+ #[ cfg_attr( target_os = "solaris" ,
1496
+ link_name = "__confstr_xpg7"
1497
+ ) ]
1495
1498
pub fn confstr( name: :: c_int, buf: * mut :: c_char, len: :: size_t) -> :: size_t;
1496
1499
}
1497
1500
}
Original file line number Diff line number Diff line change @@ -90,9 +90,7 @@ s_no_extra_traits! {
90
90
#[ cfg( target_os = "solaris" ) ]
91
91
pub uc_xrs: solaris:: xrs_t,
92
92
#[ cfg( target_os = "solaris" ) ]
93
- pub uc_lwpid: :: c_uint,
94
- #[ cfg( target_os = "solaris" ) ]
95
- pub uc_filler: [ :: c_long; 2 ] ,
93
+ pub uc_filler: [ :: c_long; 3 ] ,
96
94
}
97
95
}
98
96
You can’t perform that action at this time.
0 commit comments