Skip to content

Commit ff49322

Browse files
Fix x86_64-pc-windows-gnu build
A few functions were improperly gated to MSVC. Those functions call `windows-sys` so they're not MSVC.
1 parent 5db61a0 commit ff49322

3 files changed

Lines changed: 9 additions & 4 deletions

File tree

.github/workflows/ci.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -198,6 +198,10 @@ jobs:
198198
target: aarch64-unknown-linux-gnu
199199
dependencies:
200200
gcc-aarch64-linux-gnu: true
201+
- os: ubuntu-latest
202+
target: x86_64-pc-windows-gnu
203+
dependencies:
204+
gcc-mingw-w64-x86-64: true
201205
- os: macos-latest
202206
target: aarch64-apple-ios
203207
- os: macos-latest
@@ -216,6 +220,7 @@ jobs:
216220
gcc-multilib: ${{ matrix.dependencies.gcc-multilib || false }}
217221
musl-tools: ${{ matrix.dependencies.musl-tools || false }}
218222
gcc-aarch64-linux-gnu: ${{ matrix.dependencies.gcc-aarch64-linux-gnu || false }}
223+
gcc-mingw-w64-x86-64: ${{ matrix.dependencies.gcc-mingw-w64-x86-64 || false }}
219224

220225
- name: Restore cache
221226
uses: actions/cache/restore@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0

crates/host_env/src/time.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -317,7 +317,7 @@ pub fn gethrvtime_duration() -> Duration {
317317
Duration::from_nanos(unsafe { libc::gethrvtime() })
318318
}
319319

320-
#[cfg(target_env = "msvc")]
320+
#[cfg(windows)]
321321
#[cfg(not(target_arch = "wasm32"))]
322322
#[derive(Clone, Debug)]
323323
pub struct WindowsTimeZoneInfo {
@@ -328,15 +328,15 @@ pub struct WindowsTimeZoneInfo {
328328
pub daylight_name: String,
329329
}
330330

331-
#[cfg(target_env = "msvc")]
331+
#[cfg(windows)]
332332
#[cfg(not(target_arch = "wasm32"))]
333333
fn decode_tz_name(name: &[u16]) -> String {
334334
widestring::decode_utf16_lossy(name.iter().copied())
335335
.take_while(|&c| c != '\0')
336336
.collect()
337337
}
338338

339-
#[cfg(target_env = "msvc")]
339+
#[cfg(windows)]
340340
#[cfg(not(target_arch = "wasm32"))]
341341
#[must_use]
342342
pub fn get_tz_info() -> WindowsTimeZoneInfo {

crates/vm/src/stdlib/time.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ mod decl {
195195
Ok(get_perf_time(vm)?.as_nanos())
196196
}
197197

198-
#[cfg(target_env = "msvc")]
198+
#[cfg(windows)]
199199
#[cfg(not(target_arch = "wasm32"))]
200200
pub(super) fn get_tz_info() -> host_time::WindowsTimeZoneInfo {
201201
host_time::get_tz_info()

0 commit comments

Comments
 (0)