Commit 9cf2de8 1 parent 44e96dc commit 9cf2de8 Copy full SHA for 9cf2de8
File tree 1 file changed +12
-4
lines changed
1 file changed +12
-4
lines changed Original file line number Diff line number Diff line change @@ -129,10 +129,18 @@ impl BuildTargets {
129
129
}
130
130
131
131
pub fn shared_output_file_name ( & self ) -> Option < OsString > {
132
- if self . shared_lib . is_some ( ) && self . use_meson_naming_convention {
133
- Some ( format ! ( "lib{}.dll" , self . name) . into ( ) )
134
- } else {
135
- Some ( self . shared_lib . as_ref ( ) ?. file_name ( ) . unwrap ( ) . to_owned ( ) )
132
+ match self . lib_type ( ) {
133
+ LibType :: Windows => {
134
+ if self . shared_lib . is_some ( )
135
+ && self . use_meson_naming_convention
136
+ && self . target . env == "gnu"
137
+ {
138
+ Some ( format ! ( "lib{}.dll" , self . name) . into ( ) )
139
+ } else {
140
+ Some ( self . shared_lib . as_ref ( ) ?. file_name ( ) ?. to_owned ( ) )
141
+ }
142
+ }
143
+ _ => Some ( self . shared_lib . as_ref ( ) ?. file_name ( ) ?. to_owned ( ) ) ,
136
144
}
137
145
}
138
146
}
You can’t perform that action at this time.
0 commit comments