@@ -146,14 +146,16 @@ pub(crate) fn find_tool_inner(
146
146
impl_:: find_msvc_environment ( tool, target, env_getter)
147
147
. or_else ( || impl_:: find_msvc_15plus ( tool, target, env_getter) )
148
148
. or_else ( || impl_:: find_msvc_14 ( tool, target, env_getter) )
149
- . or_else ( || impl_:: find_msvc_12 ( tool, target, env_getter) )
150
149
}
151
150
152
151
/// A version of Visual Studio
153
152
#[ derive( Debug , PartialEq , Eq , Copy , Clone ) ]
154
153
#[ non_exhaustive]
155
154
pub enum VsVers {
156
155
/// Visual Studio 12 (2013)
156
+ #[ deprecated(
157
+ note = "Visual Studio 12 is no longer supported. cc will never return this value."
158
+ ) ]
157
159
Vs12 ,
158
160
/// Visual Studio 14 (2015)
159
161
Vs14 ,
@@ -181,7 +183,6 @@ pub fn find_vs_version() -> Result<VsVers, String> {
181
183
"16.0" => Ok ( VsVers :: Vs16 ) ,
182
184
"15.0" => Ok ( VsVers :: Vs15 ) ,
183
185
"14.0" => Ok ( VsVers :: Vs14 ) ,
184
- "12.0" => Ok ( VsVers :: Vs12 ) ,
185
186
vers => Err ( format ! (
186
187
"\n \n \
187
188
unsupported or unknown VisualStudio version: {}\n \
@@ -203,8 +204,6 @@ pub fn find_vs_version() -> Result<VsVers, String> {
203
204
Ok ( VsVers :: Vs15 )
204
205
} else if has_msbuild_version ( "14.0" ) {
205
206
Ok ( VsVers :: Vs14 )
206
- } else if has_msbuild_version ( "12.0" ) {
207
- Ok ( VsVers :: Vs12 )
208
207
} else {
209
208
Err ( "\n \n \
210
209
couldn't determine visual studio generator\n \
@@ -257,7 +256,7 @@ mod impl_ {
257
256
impl LibraryHandle {
258
257
fn new ( name : & [ u8 ] ) -> Option < Self > {
259
258
let handle = unsafe { LoadLibraryA ( name. as_ptr ( ) as _ ) } ;
260
- ( !handle. is_null ( ) ) . then ( || Self ( handle) )
259
+ ( !handle. is_null ( ) ) . then_some ( Self ( handle) )
261
260
}
262
261
263
262
/// Get a function pointer to a function in the library.
@@ -786,26 +785,6 @@ mod impl_ {
786
785
Some ( ( ) )
787
786
}
788
787
789
- // For MSVC 12 we need to find the Windows 8.1 SDK.
790
- pub ( super ) fn find_msvc_12 (
791
- tool : & str ,
792
- target : TargetArch < ' _ > ,
793
- env_getter : & dyn EnvGetter ,
794
- ) -> Option < Tool > {
795
- let vcdir = get_vc_dir ( "12.0" ) ?;
796
- let mut tool = get_tool ( tool, & vcdir, target) ?;
797
- let sub = lib_subdir ( target) ?;
798
- let sdk81 = get_sdk81_dir ( ) ?;
799
- tool. path . push ( sdk81. join ( "bin" ) . join ( sub) ) ;
800
- let sdk_lib = sdk81. join ( "lib" ) . join ( "winv6.3" ) ;
801
- tool. libs . push ( sdk_lib. join ( "um" ) . join ( sub) ) ;
802
- let sdk_include = sdk81. join ( "include" ) ;
803
- tool. include . push ( sdk_include. join ( "shared" ) ) ;
804
- tool. include . push ( sdk_include. join ( "um" ) ) ;
805
- tool. include . push ( sdk_include. join ( "winrt" ) ) ;
806
- Some ( tool. into_tool ( env_getter) )
807
- }
808
-
809
788
fn add_env (
810
789
tool : & mut Tool ,
811
790
env : & ' static str ,
@@ -1069,7 +1048,7 @@ mod impl_ {
1069
1048
|| find_msbuild_vs15 ( TargetArch ( "i686" ) , env_getter) . is_some ( )
1070
1049
|| find_msbuild_vs15 ( TargetArch ( "aarch64" ) , env_getter) . is_some ( )
1071
1050
}
1072
- "12.0" | " 14.0" => LOCAL_MACHINE
1051
+ "14.0" => LOCAL_MACHINE
1073
1052
. open ( & OsString :: from ( format ! (
1074
1053
"SOFTWARE\\ Microsoft\\ MSBuild\\ ToolsVersions\\ {}" ,
1075
1054
version
@@ -1198,24 +1177,8 @@ mod impl_ {
1198
1177
None
1199
1178
}
1200
1179
1201
- // For MSVC 12 we need to find the Windows 8.1 SDK.
1202
- #[ inline( always) ]
1203
- pub ( super ) fn find_msvc_12 (
1204
- _tool : & str ,
1205
- _target : TargetArch < ' _ > ,
1206
- _: & dyn EnvGetter ,
1207
- ) -> Option < Tool > {
1208
- None
1209
- }
1210
-
1211
1180
#[ inline( always) ]
1212
- pub ( super ) fn has_msbuild_version ( version : & str , _: & dyn EnvGetter ) -> bool {
1213
- match version {
1214
- "17.0" => false ,
1215
- "16.0" => false ,
1216
- "15.0" => false ,
1217
- "12.0" | "14.0" => false ,
1218
- _ => false ,
1219
- }
1181
+ pub ( super ) fn has_msbuild_version ( _version : & str , _: & dyn EnvGetter ) -> bool {
1182
+ false
1220
1183
}
1221
1184
}
0 commit comments