mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Use MCP510"

Browse Source 
This reverts commit 40c3d351ad. 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.
This commit is contained in:
Jakub Beránek 2023-12-10 23:18:15 +01:00
parent ec4176167b
commit 3157f2121e
No known key found for this signature in database
GPG Key ID: 909CD0D26483516B
1 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/bootstrap/src/utils/helpers.rs
View File

@ -15,7 +15,8 @@
use std::time::{Instant, SystemTime, UNIX_EPOCH}; use std::time::{Instant, SystemTime, UNIX_EPOCH};
use crate::core::builder::Builder; 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}; pub use crate::utils::dylib::{dylib_path, dylib_path_var};
@ -513,16 +514,7 @@ pub fn linker_flags(
) -> Vec<String> { ) -> Vec<String> {
let mut args = vec![]; let mut args = vec![];
if !builder.is_lld_direct_linker(target) && builder.config.lld_mode.is_used() { if !builder.is_lld_direct_linker(target) && builder.config.lld_mode.is_used() {
match builder.config.lld_mode { args.push(String::from("-Clink-arg=-fuse-ld=lld"));
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 => {}
}
if matches!(lld_threads, LldThreads::No) { if matches!(lld_threads, LldThreads::No) {
args.push(format!( args.push(format!(