From 3157f2121ecf4c168ae69f2e67548ad7e801207e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20Ber=C3=A1nek?= <berykubik@gmail.com>
Date: Sun, 10 Dec 2023 23:18:15 +0100
Subject: [PATCH] Revert "Use MCP510"
This reverts commit 40c3d351ada5d991f7474ecc4bc6c9b976c656cb. 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.
---
src/bootstrap/src/utils/helpers.rs | 14 +++-----------
1 file changed, 3 insertions(+), 11 deletions(-)
diff --git a/src/bootstrap/src/utils/helpers.rs b/src/bootstrap/src/utils/helpers.rs
index e563a83c5c4..133792d85e8 100644
--- a/src/bootstrap/src/utils/helpers.rs
+++ b/src/bootstrap/src/utils/helpers.rs
@@ -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};
@@ -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!(