Skip to content

Commit

Permalink
Revert "Use MCP510"
Browse files Browse the repository at this point in the history
This reverts commit 40c3d35. The option was dogfooded for using lld with MCP510 , but it broke testing with LLD, because we don't pass `-Zunstable-options` on enough places.
  • Loading branch information
Kobzol committed Dec 10, 2023
1 parent ec41761 commit 3157f21
Showing 1 changed file with 3 additions and 11 deletions.
14 changes: 3 additions & 11 deletions src/bootstrap/src/utils/helpers.rs
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@ use std::sync::OnceLock;
use std::time::{Instant, SystemTime, UNIX_EPOCH};

use crate::core::builder::Builder;
use crate::core::config::{Config, LldMode, TargetSelection};
use crate::core::config::{Config, TargetSelection};
use crate::LldMode;

pub use crate::utils::dylib::{dylib_path, dylib_path_var};

Expand Down Expand Up @@ -513,16 +514,7 @@ pub fn linker_flags(
) -> Vec<String> {
let mut args = vec![];
if !builder.is_lld_direct_linker(target) && builder.config.lld_mode.is_used() {
match builder.config.lld_mode {
LldMode::External => {
args.push("-Clinker-flavor=gnu-lld-cc".to_string());
}
LldMode::SelfContained => {
args.push("-Clinker-flavor=gnu-lld-cc".to_string());
args.push("-Clink-self-contained=+linker".to_string());
}
LldMode::Unused => {}
}
args.push(String::from("-Clink-arg=-fuse-ld=lld"));

if matches!(lld_threads, LldThreads::No) {
args.push(format!(
Expand Down

0 comments on commit 3157f21

Please sign in to comment.