diff --git a/src/windows/find_tools.rs b/src/windows/find_tools.rs index 4f0ed8741..6f0244624 100644 --- a/src/windows/find_tools.rs +++ b/src/windows/find_tools.rs @@ -88,7 +88,6 @@ pub fn find_tool(target: &str, tool: &str) -> Option { .or_else(|| impl_::find_msvc_15plus(tool, target)) .or_else(|| impl_::find_msvc_14(tool, target)) .or_else(|| impl_::find_msvc_12(tool, target)) - .or_else(|| impl_::find_msvc_11(tool, target)) } /// A version of Visual Studio @@ -699,22 +698,6 @@ mod impl_ { Some(tool.into_tool()) } - // For MSVC 11 we need to find the Windows 8 SDK. - pub(super) fn find_msvc_11(tool: &str, target: TargetArch<'_>) -> Option { - let vcdir = get_vc_dir("11.0")?; - let mut tool = get_tool(tool, &vcdir, target)?; - let sub = lib_subdir(target)?; - let sdk8 = get_sdk8_dir()?; - tool.path.push(sdk8.join("bin").join(sub)); - let sdk_lib = sdk8.join("lib").join("win8"); - tool.libs.push(sdk_lib.join("um").join(sub)); - let sdk_include = sdk8.join("include"); - tool.include.push(sdk_include.join("shared")); - tool.include.push(sdk_include.join("um")); - tool.include.push(sdk_include.join("winrt")); - Some(tool.into_tool()) - } - fn add_env(tool: &mut Tool, env: &str, paths: Vec) { let prev = env::var_os(env).unwrap_or(OsString::new()); let prev = env::split_paths(&prev); @@ -837,13 +820,6 @@ mod impl_ { Some(root.into()) } - fn get_sdk8_dir() -> Option { - let key = r"SOFTWARE\Microsoft\Microsoft SDKs\Windows\v8.0"; - let key = LOCAL_MACHINE.open(key.as_ref()).ok()?; - let root = key.query_str("InstallationFolder").ok()?; - Some(root.into()) - } - const PROCESSOR_ARCHITECTURE_INTEL: u16 = 0; const PROCESSOR_ARCHITECTURE_AMD64: u16 = 9; const PROCESSOR_ARCHITECTURE_ARM64: u16 = 12; @@ -1083,11 +1059,6 @@ mod impl_ { None } - // For MSVC 11 we need to find the Windows 8 SDK. - pub(super) fn find_msvc_11(_tool: &str, _target: TargetArch<'_>) -> Option { - None - } - pub(super) fn has_msbuild_version(version: &str) -> bool { match version { "17.0" => false,