@@ -80,7 +80,6 @@ pub fn find_tool(target: &str, tool: &str) -> Option<Tool> {
80
80
. or_else ( || impl_:: find_msvc_15plus ( tool, target) )
81
81
. or_else ( || impl_:: find_msvc_14 ( tool, target) )
82
82
. or_else ( || impl_:: find_msvc_12 ( tool, target) )
83
- . or_else ( || impl_:: find_msvc_11 ( tool, target) )
84
83
}
85
84
86
85
/// A version of Visual Studio
@@ -714,22 +713,6 @@ mod impl_ {
714
713
Some ( tool. into_tool ( ) )
715
714
}
716
715
717
- // For MSVC 11 we need to find the Windows 8 SDK.
718
- pub fn find_msvc_11 ( tool : & str , target : TargetArch < ' _ > ) -> Option < Tool > {
719
- let vcdir = get_vc_dir ( "11.0" ) ?;
720
- let mut tool = get_tool ( tool, & vcdir, target) ?;
721
- let sub = lib_subdir ( target) ?;
722
- let sdk8 = get_sdk8_dir ( ) ?;
723
- tool. path . push ( sdk8. join ( "bin" ) . join ( sub) ) ;
724
- let sdk_lib = sdk8. join ( "lib" ) . join ( "win8" ) ;
725
- tool. libs . push ( sdk_lib. join ( "um" ) . join ( sub) ) ;
726
- let sdk_include = sdk8. join ( "include" ) ;
727
- tool. include . push ( sdk_include. join ( "shared" ) ) ;
728
- tool. include . push ( sdk_include. join ( "um" ) ) ;
729
- tool. include . push ( sdk_include. join ( "winrt" ) ) ;
730
- Some ( tool. into_tool ( ) )
731
- }
732
-
733
716
fn add_env ( tool : & mut Tool , env : & str , paths : Vec < PathBuf > ) {
734
717
let prev = env:: var_os ( env) . unwrap_or ( OsString :: new ( ) ) ;
735
718
let prev = env:: split_paths ( & prev) ;
@@ -852,13 +835,6 @@ mod impl_ {
852
835
Some ( root. into ( ) )
853
836
}
854
837
855
- fn get_sdk8_dir ( ) -> Option < PathBuf > {
856
- let key = r"SOFTWARE\Microsoft\Microsoft SDKs\Windows\v8.0" ;
857
- let key = LOCAL_MACHINE . open ( key. as_ref ( ) ) . ok ( ) ?;
858
- let root = key. query_str ( "InstallationFolder" ) . ok ( ) ?;
859
- Some ( root. into ( ) )
860
- }
861
-
862
838
const PROCESSOR_ARCHITECTURE_INTEL : u16 = 0 ;
863
839
const PROCESSOR_ARCHITECTURE_AMD64 : u16 = 9 ;
864
840
const PROCESSOR_ARCHITECTURE_ARM64 : u16 = 12 ;
0 commit comments