@@ -87,14 +87,16 @@ pub fn find_tool(target: &str, tool: &str) -> Option<Tool> {
87
87
impl_:: find_msvc_environment ( tool, target)
88
88
. or_else ( || impl_:: find_msvc_15plus ( tool, target) )
89
89
. or_else ( || impl_:: find_msvc_14 ( tool, target) )
90
- . or_else ( || impl_:: find_msvc_12 ( tool, target) )
91
90
}
92
91
93
92
/// A version of Visual Studio
94
93
#[ derive( Debug , PartialEq , Eq , Copy , Clone ) ]
95
94
#[ non_exhaustive]
96
95
pub enum VsVers {
97
96
/// Visual Studio 12 (2013)
97
+ #[ deprecated(
98
+ note = "Visual Studio 12 is no longer supported. cc will never return this value."
99
+ ) ]
98
100
Vs12 ,
99
101
/// Visual Studio 14 (2015)
100
102
Vs14 ,
@@ -117,7 +119,6 @@ pub fn find_vs_version() -> Result<VsVers, String> {
117
119
"16.0" => Ok ( VsVers :: Vs16 ) ,
118
120
"15.0" => Ok ( VsVers :: Vs15 ) ,
119
121
"14.0" => Ok ( VsVers :: Vs14 ) ,
120
- "12.0" => Ok ( VsVers :: Vs12 ) ,
121
122
vers => Err ( format ! (
122
123
"\n \n \
123
124
unsupported or unknown VisualStudio version: {}\n \
@@ -139,8 +140,6 @@ pub fn find_vs_version() -> Result<VsVers, String> {
139
140
Ok ( VsVers :: Vs15 )
140
141
} else if impl_:: has_msbuild_version ( "14.0" ) {
141
142
Ok ( VsVers :: Vs14 )
142
- } else if impl_:: has_msbuild_version ( "12.0" ) {
143
- Ok ( VsVers :: Vs12 )
144
143
} else {
145
144
Err ( format ! (
146
145
"\n \n \
@@ -695,22 +694,6 @@ mod impl_ {
695
694
Some ( ( ) )
696
695
}
697
696
698
- // For MSVC 12 we need to find the Windows 8.1 SDK.
699
- pub ( super ) fn find_msvc_12 ( tool : & str , target : TargetArch < ' _ > ) -> Option < Tool > {
700
- let vcdir = get_vc_dir ( "12.0" ) ?;
701
- let mut tool = get_tool ( tool, & vcdir, target) ?;
702
- let sub = lib_subdir ( target) ?;
703
- let sdk81 = get_sdk81_dir ( ) ?;
704
- tool. path . push ( sdk81. join ( "bin" ) . join ( sub) ) ;
705
- let sdk_lib = sdk81. join ( "lib" ) . join ( "winv6.3" ) ;
706
- tool. libs . push ( sdk_lib. join ( "um" ) . join ( sub) ) ;
707
- let sdk_include = sdk81. join ( "include" ) ;
708
- tool. include . push ( sdk_include. join ( "shared" ) ) ;
709
- tool. include . push ( sdk_include. join ( "um" ) ) ;
710
- tool. include . push ( sdk_include. join ( "winrt" ) ) ;
711
- Some ( tool. into_tool ( ) )
712
- }
713
-
714
697
fn add_env ( tool : & mut Tool , env : & str , paths : Vec < PathBuf > ) {
715
698
let prev = env:: var_os ( env) . unwrap_or ( OsString :: new ( ) ) ;
716
699
let prev = env:: split_paths ( & prev) ;
@@ -960,7 +943,7 @@ mod impl_ {
960
943
|| find_msbuild_vs15 ( TargetArch ( "i686" ) ) . is_some ( )
961
944
|| find_msbuild_vs15 ( TargetArch ( "aarch64" ) ) . is_some ( )
962
945
}
963
- "12.0" | " 14.0" => LOCAL_MACHINE
946
+ "14.0" => LOCAL_MACHINE
964
947
. open ( & OsString :: from ( format ! (
965
948
"SOFTWARE\\ Microsoft\\ MSBuild\\ ToolsVersions\\ {}" ,
966
949
version
@@ -1067,18 +1050,7 @@ mod impl_ {
1067
1050
None
1068
1051
}
1069
1052
1070
- // For MSVC 12 we need to find the Windows 8.1 SDK.
1071
- pub ( super ) fn find_msvc_12 ( _tool : & str , _target : TargetArch < ' _ > ) -> Option < Tool > {
1072
- None
1073
- }
1074
-
1075
- pub ( super ) fn has_msbuild_version ( version : & str ) -> bool {
1076
- match version {
1077
- "17.0" => false ,
1078
- "16.0" => false ,
1079
- "15.0" => false ,
1080
- "12.0" | "14.0" => false ,
1081
- _ => false ,
1082
- }
1053
+ pub ( super ) fn has_msbuild_version ( _version : & str ) -> bool {
1054
+ false
1083
1055
}
1084
1056
}
0 commit comments