From fb6fa0720400d8fa7d9ae29d02c2db58a57a6c8a Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Thu, 28 Oct 2021 22:30:16 +0200
Subject: Split paths module into driver and runner parts

There are still a few remaining paths that are defined in both driver
and runner.
---
 crates/driver/src/context.rs | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'crates/driver/src/context.rs')

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 {
-- 
cgit v1.2.3