Don't use /usr as fallback sysroot on Windows

rust-lang · Sep 4, 2020 · e94a533 · e94a533
1 parent 81468be
commit e94a533
Showing 1 changed file with 11 additions and 3 deletions.
diff --git a/src/lib.rs b/src/lib.rs
@@ -505,9 +505,17 @@ impl Library {
             let sysroot = config
                 .env_var_os("PKG_CONFIG_SYSROOT_DIR")
                 .or_else(|| config.env_var_os("SYSROOT"))
-                .map(PathBuf::from)
-                .unwrap_or_else(|| PathBuf::from("/usr"));
-            vec![sysroot]
+                .map(PathBuf::from);
+
+            if cfg!(target_os = "windows") {
+                if let Some(sysroot) = sysroot {
+                    vec![sysroot]
+                } else {
+                    vec![]
+                }
+            } else {
+                vec![sysroot.unwrap_or_else(|| PathBuf::from("/usr"))]
+            }
         };
 
         let words = split_flags(output);