diff --git a/.github/workflows/rust-tests.yml b/.github/workflows/rust-tests.yml
index 86e6ffec..d6be9440 100644
--- a/.github/workflows/rust-tests.yml
+++ b/.github/workflows/rust-tests.yml
@@ -36,6 +36,8 @@ jobs:
             target: x86_64-unknown-linux-gnu
           - host: windows-latest
             target: x86_64-pc-windows-msvc
+          - host: windows-latest
+            target: x86_64-pc-windows-gnu
           - host: macos-14
             target: aarch64-apple-darwin
           - host: macos-latest
diff --git a/bindings/rust/build.rs b/bindings/rust/build.rs
index 42293341..2f4170af 100644
--- a/bindings/rust/build.rs
+++ b/bindings/rust/build.rs
@@ -19,7 +19,12 @@ fn main() {
         // an int. There is a bug in bindgen associated with this. It assumes that a bool in C is
         // the same size as a bool in Rust. This is the root cause of the issues on Windows. If/when
         // this is fixed in bindgen, it should be safe to remove this compiler flag.
-        cc.flag("/std:c11");
+
+        // This flag is for MSVC
+        cc.flag_if_supported("/std:c11");
+
+        // This is for GCC
+        cc.flag_if_supported("-std=c11");
     }
 
     cc.include(c_src_dir.clone());
@@ -155,7 +160,7 @@ fn make_bindings(
 #[cfg(feature = "generate-bindings")]
 fn replace_ckzg_ret_repr(mut bindings: String) -> String {
     let target = env::var("TARGET").unwrap_or_default();
-    let repr_to_replace = if target.contains("windows") {
+    let repr_to_replace = if target.contains("windows") && target.contains("msvc") {
         "#[repr(i32)]"
     } else {
         "#[repr(u32)]"