From 5b3b5eebbf0a113bcbc50ef6450aeb84ce280259 Mon Sep 17 00:00:00 2001
From: timvisee <tim@visee.me>
Date: Thu, 14 Oct 2021 23:02:10 +0200
Subject: [PATCH] Bump version-compare to 0.1.0, remove some unwraps

---
 sdl2-sys/Cargo.toml |  2 +-
 sdl2-sys/build.rs   | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/sdl2-sys/Cargo.toml b/sdl2-sys/Cargo.toml
index dfebc664..2012a512 100644
--- a/sdl2-sys/Cargo.toml
+++ b/sdl2-sys/Cargo.toml
@@ -40,7 +40,7 @@ version = "^1"
 optional = true
 
 [build-dependencies]
-version-compare = "0.0.10"
+version-compare = "0.1"
 cfg-if = "^1.0"
 
 [features]
diff --git a/sdl2-sys/build.rs b/sdl2-sys/build.rs
index eb3f499f..468f9bfc 100644
--- a/sdl2-sys/build.rs
+++ b/sdl2-sys/build.rs
@@ -112,16 +112,16 @@ fn compile_sdl2(sdl2_build_path: &Path, target_os: &str) -> PathBuf {
 
         #[cfg(target_os = "linux")]
         {
-            use version_compare::Version;
+            // Add common flag for affected version and above
+            use version_compare::{compare_to, Cmp};
             if let Ok(version) = std::process::Command::new("cc")
                 .arg("-dumpversion")
                 .output()
             {
-                let local_ver =
-                    Version::from(std::str::from_utf8(&version.stdout).unwrap()).unwrap();
-                let affected_ver = Version::from("10").unwrap();
-
-                if local_ver >= affected_ver {
+                let affected =
+                    compare_to(std::str::from_utf8(&version.stdout).unwrap(), "10", Cmp::Ge)
+                        .unwrap_or(true);
+                if affected {
                     cfg.cflag("-fcommon");
                 }
             }