Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Switch linker for aarch64-pc-windows-msvc from LLD to MSVC #54290

Merged
merged 1 commit into from
Sep 21, 2018
Merged

Switch linker for aarch64-pc-windows-msvc from LLD to MSVC #54290

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions src/librustc_target/spec/aarch64_pc_windows_msvc.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
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,
})
}