diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-09-12 12:15:47 -0400 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-09-12 12:18:14 -0400 |
| commit | 479e9172b3583cedcada90ed193cab156cdc56b5 (patch) | |
| tree | debd2d7d31ebbfee5e8c6462ada05f53f0424600 /src/libstore | |
| parent | 4ba47205c687772cf73a490eac3a489931d4913b (diff) | |
Build hook: Pass the timeout to the remote builder
Note that this will only work if the client has a very recent Nix
version (post 15e1b2c223494ecb5efefc3ea0e3b926a6b1d7dc), otherwise the
--option flag will just be ignored.
Fixes #50.
Diffstat (limited to 'src/libstore')
| -rw-r--r-- | src/libstore/build.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstore/build.cc b/src/libstore/build.cc index e94c6b793..7fc47f3f5 100644 --- a/src/libstore/build.cc +++ b/src/libstore/build.cc @@ -690,10 +690,10 @@ HookInstance::HookInstance() if (dup2(builderOut.writeSide, 4) == -1) throw SysError("dupping builder's stdout/stderr"); - /* XXX: Pass `buildTimeout' to the hook? */ execl(buildHook.c_str(), buildHook.c_str(), settings.thisSystem.c_str(), (format("%1%") % settings.maxSilentTime).str().c_str(), (format("%1%") % settings.printBuildTrace).str().c_str(), + (format("%1%") % settings.buildTimeout).str().c_str(), NULL); throw SysError(format("executing `%1%'") % buildHook); |