Only query staticlibs if they don't collide with other lib types on prefix/suffix

Author: osiewicz

compiler/rustc_metadata/src/locator.rs

@@ -413,11 +413,15 @@ impl<'a> CrateLocator<'a> {
             debug!("searching {}", search_path.dir.display());
             let spf = &search_path.files;
 
+            let mut should_check_staticlibs = true;
             for (prefix, suffix, kind) in [
                 (rlib_prefix.as_str(), rlib_suffix, CrateFlavor::Rlib),
                 (rmeta_prefix.as_str(), rmeta_suffix, CrateFlavor::Rmeta),
                 (dylib_prefix, dylib_suffix, CrateFlavor::Dylib),
             ] {
+                if prefix == staticlib_prefix && suffix == staticlib_suffix {
+                    should_check_staticlibs = false;
+                }
                 if let Some(matches) = spf.query(prefix, suffix) {
                     for (hash, spf) in matches {
                         info!("lib candidate: {}", spf.path.display());
@@ -438,7 +442,10 @@ impl<'a> CrateLocator<'a> {
                     }
                 }
             }
-            if let Some(static_matches) = spf.query(staticlib_prefix, staticlib_suffix) {
+            if let Some(static_matches) = should_check_staticlibs
+                .then(|| spf.query(staticlib_prefix, staticlib_suffix))
+                .flatten()
+            {
                 for (_, spf) in static_matches {
                     self.crate_rejections.via_kind.push(CrateMismatch {
                         path: spf.path.to_path_buf(),