user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix tidy checks

Browse source
This commit is contained in:
Martin Finkel 2019-07-31 17:15:26 +07:00
parent 6e4d02369a
commit 3c6f6f0316
4 changed files with 24 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/librustc_target/spec/aarch64_uwp_windows_msvc.rs
View file

@ -9,9 +9,14 @@ pub fn target() -> TargetResult {
// FIXME: this shouldn't be panic=abort, it should be panic=unwind
base.panic_strategy = PanicStrategy::Abort;
let lib_root_path = env::var("VCToolsInstallDir").expect("VCToolsInstallDir not found in env");
let lib_root_path = env::var("VCToolsInstallDir")
.expect("VCToolsInstallDir not found in env");
base.pre_link_args.get_mut(&LinkerFlavor::Msvc).unwrap()
.push(format!("{}{}{}", "/LIBPATH:".to_string(), lib_root_path, "lib\\arm64\\store".to_string()));
.push(format!("{}{}{}",
"/LIBPATH:".to_string(),
lib_root_path,
"lib\\arm64\\store".to_string()));
Ok(Target {
llvm_target: "aarch64-pc-windows-msvc".to_string(),

11
src/librustc_target/spec/i686_uwp_windows_msvc.rs
View file

@ -7,9 +7,14 @@ pub fn target() -> TargetResult {
base.max_atomic_width = Some(64);
base.has_elf_tls = true;
let lib_root_path = env::var("VCToolsInstallDir").expect("VCToolsInstallDir not found in env");
let lib_root_path = env::var("VCToolsInstallDir")
.expect("VCToolsInstallDir not found in env");
base.pre_link_args.get_mut(&LinkerFlavor::Msvc).unwrap()
.push(format!("{}{}{}", "/LIBPATH:".to_string(), lib_root_path, "lib\\x86\\store".to_string()));
.push(format!("{}{}{}",
"/LIBPATH:".to_string(),
lib_root_path,
"lib\\x86\\store".to_string()));
Ok(Target {
llvm_target: "i686-pc-windows-msvc".to_string(),
@ -24,4 +29,4 @@ pub fn target() -> TargetResult {
linker_flavor: LinkerFlavor::Msvc,
options: base,
})
}
}

2
src/librustc_target/spec/windows_uwp_msvc_base.rs
View file

@ -30,4 +30,4 @@ pub fn opts() -> TargetOptions {
.. Default::default()
}
}
}

11
src/librustc_target/spec/x86_64_uwp_windows_msvc.rs
View file

@ -7,9 +7,14 @@ pub fn target() -> TargetResult {
base.max_atomic_width = Some(64);
base.has_elf_tls = true;
let lib_root_path = env::var("VCToolsInstallDir").expect("VCToolsInstallDir not found in env");
let lib_root_path = env::var("VCToolsInstallDir")
.expect("VCToolsInstallDir not found in env");
base.pre_link_args.get_mut(&LinkerFlavor::Msvc).unwrap()
.push(format!("{}{}{}", "/LIBPATH:".to_string(), lib_root_path, "lib\\x64\\store".to_string()));
.push(format!("{}{}{}",
"/LIBPATH:".to_string(),
lib_root_path,
"lib\\x64\\store".to_string()));
Ok(Target {
llvm_target: "x86_64-pc-windows-msvc".to_string(),
@ -24,4 +29,4 @@ pub fn target() -> TargetResult {
linker_flavor: LinkerFlavor::Msvc,
options: base,
})
}
}