diff options
Diffstat (limited to 'crates/driver/src/driver.rs')
| -rw-r--r-- | crates/driver/src/driver.rs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/crates/driver/src/driver.rs b/crates/driver/src/driver.rs index 683e111..75aff02 100644 --- a/crates/driver/src/driver.rs +++ b/crates/driver/src/driver.rs @@ -7,11 +7,11 @@ use indoc::indoc; use nix::poll; use common::{error::*, string_hash::*, types::*}; -use runner::{paths, Runner}; +use runner::Runner; use crate::{ context::{Context, TaskRef}, - resolve, + paths, resolve, task::*, template, }; @@ -88,7 +88,7 @@ impl<'ctx> CompletionState<'ctx> { .filter_map(|dep| self.tasks_done[&dep.task].outputs.get(dep.output)) .map(|&output| Dependency::Task { output, - path: paths::abs(paths::TASK_SYSROOT), + path: paths::TASK_SYSROOT.to_string(), }), ) .collect()) @@ -269,7 +269,7 @@ impl<'ctx> Driver<'ctx> { .iter() .map(|(name, Output { path, .. })| { let output_path = if let Some(path) = path { - paths::join(&[paths::TASK_DESTDIR, path]) + format!("{}/{}", paths::TASK_DESTDIR, path) } else { paths::TASK_DESTDIR.to_string() }; |