Skip to content

Commit

Permalink
Switch linker for aarch64-pc-windows-msvc from LLD to MSVC, since tha…
Browse files Browse the repository at this point in the history
…t seems to work better.
  • Loading branch information
michaelwoerister committed Sep 17, 2018
1 parent ed94397 commit 73b3c28
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions src/librustc_target/spec/aarch64_pc_windows_msvc.rs
Expand Up @@ -8,7 +8,7 @@
// option. This file may not be copied, modified, or distributed
// except according to those terms.

use spec::{LinkerFlavor, Target, TargetResult, PanicStrategy, LldFlavor};
use spec::{LinkerFlavor, Target, TargetResult, PanicStrategy};

pub fn target() -> TargetResult {
let mut base = super::windows_msvc_base::opts();
Expand All @@ -17,7 +17,6 @@ pub fn target() -> TargetResult {

// FIXME: this shouldn't be panic=abort, it should be panic=unwind
base.panic_strategy = PanicStrategy::Abort;
base.linker = Some("rust-lld".to_owned());

Ok(Target {
llvm_target: "aarch64-pc-windows-msvc".to_string(),
Expand All @@ -29,7 +28,7 @@ pub fn target() -> TargetResult {
target_os: "windows".to_string(),
target_env: "msvc".to_string(),
target_vendor: "pc".to_string(),
linker_flavor: LinkerFlavor::Lld(LldFlavor::Link),
linker_flavor: LinkerFlavor::Msvc,
options: base,
})
}

0 comments on commit 73b3c28

Please sign in to comment.