File tree Expand file tree Collapse file tree 1 file changed +5
-4
lines changed
compiler/rustc_metadata/src Expand file tree Collapse file tree 1 file changed +5
-4
lines changed Original file line number Diff line number Diff line change @@ -96,13 +96,14 @@ pub fn try_find_native_static_library(
96
96
verbatim : bool ,
97
97
) -> Option < PathBuf > {
98
98
let default = sess. staticlib_components ( verbatim) ;
99
+ let unix = ( "lib" , ".a" ) ;
99
100
let formats = if verbatim {
100
101
vec ! [ default ]
102
+ } else if default != unix && sess. target . is_like_msvc {
103
+ // On Windows MSVC naming scheme `libfoo.a` is used as a fallback from default `foo.lib`.
104
+ vec ! [ default , unix]
101
105
} else {
102
- // On Windows, static libraries sometimes show up as libfoo.a and other
103
- // times show up as foo.lib
104
- let unix = ( "lib" , ".a" ) ;
105
- if default == unix { vec ! [ default ] } else { vec ! [ default , unix] }
106
+ vec ! [ default ]
106
107
} ;
107
108
108
109
walk_native_lib_search_dirs ( sess, None , |dir, is_framework| {
You can’t perform that action at this time.
0 commit comments