diff options
| author | Matthias Schiffer <mschiffer@universe-factory.net> | 2021-09-26 10:41:04 +0200 |
|---|---|---|
| committer | Matthias Schiffer <mschiffer@universe-factory.net> | 2021-09-26 14:18:06 +0200 |
| commit | 3995fe99a9a2be2e4c7b5ce25c80ea7899f7230f (patch) | |
| tree | 0e75ae639bb533e19abe81ca9eb99b3f9060adba /src/executor.rs | |
| parent | eb052bdbaff92147e8012985f5d6fe0d78390f3c (diff) | |
| download | rebel-3995fe99a9a2be2e4c7b5ce25c80ea7899f7230f.tar rebel-3995fe99a9a2be2e4c7b5ce25c80ea7899f7230f.zip | |
Pass path with dependencies instead of distinguishing build and host deps
Diffstat (limited to 'src/executor.rs')
| -rw-r--r-- | src/executor.rs | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/executor.rs b/src/executor.rs index 0b2e1bd..bb29edd 100644 --- a/src/executor.rs +++ b/src/executor.rs @@ -138,7 +138,10 @@ impl<'ctx> Executor<'ctx> { .expect("invalid runtime depends of build_depends") .iter() .filter_map(|dep| self.tasks_done[&dep.task].output.get(dep.output)) - .map(|&output| Dependency::BuildTask { output }), + .map(|&output| Dependency::Task { + output, + path: "".to_string(), + }), ) .chain( resolve::runtime_depends( @@ -151,7 +154,10 @@ impl<'ctx> Executor<'ctx> { .expect("invalid runtime depends of host_depends") .iter() .filter_map(|dep| self.tasks_done[&dep.task].output.get(dep.output)) - .map(|&output| Dependency::HostTask { output }), + .map(|&output| Dependency::Task { + output, + path: paths::abs(paths::SYSROOT_PREFIX), + }), ) .map(|dep| (dep.dependency_hash(), dep)) .collect() |