newell
/
nac3
forked from M-Labs/nac3
1
0
Fork 0
Code Pull Requests Activity

nac3artiq: fix linker inputs

This commit is contained in:
Sebastien Bourdeauducq 2021-11-06 14:23:54 +08:00
parent 204baabfd2
commit 37eae090e5
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
nac3artiq/src/lib.rs
View File

@ -470,7 +470,10 @@ impl Nac3 {
if isa != Isa::Host { if isa != Isa::Host {
linker_args.push("-T".to_string() + self.working_directory.path().join("kernel.ld").to_str().unwrap()); linker_args.push("-T".to_string() + self.working_directory.path().join("kernel.ld").to_str().unwrap());
} }
linker_args.extend(thread_names.iter().map(|name| name.to_owned() + ".o")); linker_args.extend(thread_names.iter().map(|name| {
let name_o = name.to_owned() + ".o";
self.working_directory.path().join(name_o.as_str()).to_str().unwrap().to_string()
}));
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() {
return Err(exceptions::PyRuntimeError::new_err( return Err(exceptions::PyRuntimeError::new_err(