diff options
Diffstat (limited to 'src/libstore/build/substitution-goal.hh')
| -rw-r--r-- | src/libstore/build/substitution-goal.hh | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/src/libstore/build/substitution-goal.hh b/src/libstore/build/substitution-goal.hh index 3c97b19fd..cef3a4c5c 100644 --- a/src/libstore/build/substitution-goal.hh +++ b/src/libstore/build/substitution-goal.hh @@ -46,7 +46,7 @@ struct PathSubstitutionGoal : public Goal /** * Pipe for the substituter's standard output. */ - Pipe outPipe; + kj::Own<kj::CrossThreadPromiseFulfiller<void>> outPipe; /** * The substituter thread. @@ -90,8 +90,6 @@ public: ); ~PathSubstitutionGoal(); - Finished timedOut(Error && ex) override { abort(); }; - /** * We prepend "a$" to the key name to ensure substitution goals * happen before derivation goals. @@ -101,7 +99,7 @@ public: return "a$" + std::string(storePath.name()) + "$" + worker.store.printStorePath(storePath); } - kj::Promise<Result<WorkResult>> work(bool inBuildSlot) noexcept override; + kj::Promise<Result<WorkResult>> work() noexcept override; /** * The states. @@ -112,11 +110,6 @@ public: kj::Promise<Result<WorkResult>> tryToRun(bool inBuildSlot) noexcept; kj::Promise<Result<WorkResult>> finished(bool inBuildSlot) noexcept; - /** - * Callback used by the worker to write to the log. - */ - WorkResult handleChildOutput(int fd, std::string_view data) override; - /* Called by destructor, can't be overridden */ void cleanup() override final; |