diff --git a/src/whisper_grammar.rs b/src/whisper_grammar.rs
index ab5fe6f..c35cb80 100644
--- a/src/whisper_grammar.rs
+++ b/src/whisper_grammar.rs
@@ -5,8 +5,8 @@ use whisper_rs_sys::{
     whisper_gretype_WHISPER_GRETYPE_RULE_REF,
 };
 
-#[cfg_attr(not(windows), repr(u32))]
-#[cfg_attr(windows, repr(i32))] // windows being *special* again
+#[cfg_attr(any(not(windows), target_env = "gnu"), repr(u32))] // include windows-gnu
+#[cfg_attr(all(windows, not(target_env = "gnu")), repr(i32))] // msvc being *special* again
 #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
 pub enum WhisperGrammarElementType {
     /// End of rule definition
diff --git a/sys/build.rs b/sys/build.rs
index 1628bf5..7def6f1 100644
--- a/sys/build.rs
+++ b/sys/build.rs
@@ -146,7 +146,7 @@ fn main() {
 
     let destination = config.build();
 
-    if env::var("TARGET").unwrap().contains("window") {
+    if target.contains("window") && !target.contains("gnu") {
         println!(
             "cargo:rustc-link-search={}",
             out.join("build").join("Release").display()