M-Labs/nac3
M-Labs
/
nac3
8
0
Fork 10
Code Issues 97 Pull Requests 19 Releases Wiki Activity

nac3artiq: do not use custom linker script when targeting host

This commit is contained in:
Sebastien Bourdeauducq 2021-10-31 23:51:50 +08:00
parent 8b73a123cc
commit 443b95d909
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nac3artiq/src/lib.rs
View File

@ -455,11 +455,13 @@ impl Nac3 {
let mut linker_args = vec![ let mut linker_args = vec![
"-shared".to_string(), "-shared".to_string(),
"--eh-frame-hdr".to_string(), "--eh-frame-hdr".to_string(),
"-Tkernel.ld".to_string(),
"-x".to_string(), "-x".to_string(),
"-o".to_string(), "-o".to_string(),
"module.elf".to_string(), "module.elf".to_string(),
]; ];
if isa != Isa::Host {
linker_args.push("-Tkernel.ld".to_string());
}
linker_args.extend(thread_names.iter().map(|name| name.to_owned() + ".o")); linker_args.extend(thread_names.iter().map(|name| name.to_owned() + ".o"));
if let Ok(linker_status) = Command::new("ld.lld").args(linker_args).status() { if let Ok(linker_status) = Command::new("ld.lld").args(linker_args).status() {
if !linker_status.success() { if !linker_status.success() {