diff options
Diffstat (limited to 'crates/driver/src/context.rs')
| -rw-r--r-- | crates/driver/src/context.rs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/crates/driver/src/context.rs b/crates/driver/src/context.rs index daed230..4fcc3e5 100644 --- a/crates/driver/src/context.rs +++ b/crates/driver/src/context.rs @@ -15,10 +15,10 @@ use common::{ error::{self, Contextualizable}, types::TaskID, }; -use runner::paths; use crate::{ args::{self, arg, Arg, ArgMapping, ArgType, PlatformRelation, TaskArgs}, + paths, task::*, }; @@ -128,7 +128,7 @@ fn platform_relation(args: &TaskArgs, from: &str, to: &str) -> Option<PlatformRe } else { PlatformRelation { is_same: false, - sysroot: paths::abs(paths::TASK_SYSROOT), + sysroot: paths::TASK_SYSROOT.to_string(), cross_compile: format!("{}/bin/{}-", plat_from.prefix, plat_to.gnu_triplet), } }; @@ -169,10 +169,10 @@ impl Context { let globals = TaskArgs::from_iter([ ("build".to_string(), platforms["build"].clone()), - arg("workdir", paths::abs(paths::TASK_WORKDIR)), - arg("dldir", paths::abs(paths::TASK_DLDIR)), - arg("destdir", paths::abs(paths::TASK_DESTDIR)), - arg("sysroot", paths::abs(paths::TASK_SYSROOT)), + arg("workdir", paths::TASK_WORKDIR.to_string()), + arg("dldir", paths::TASK_DLDIR.to_string()), + arg("destdir", paths::TASK_DESTDIR.to_string()), + arg("sysroot", paths::TASK_SYSROOT.to_string()), ]); Context { |