diff options
| -rwxr-xr-x | scripts/build-remote.pl.in | 5 | ||||
| -rw-r--r-- | src/libstore/build.cc | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/scripts/build-remote.pl.in b/scripts/build-remote.pl.in index 413d0402bf7a..a4eee75d1b17 100755 --- a/scripts/build-remote.pl.in +++ b/scripts/build-remote.pl.in @@ -46,7 +46,7 @@ sub all { $_ || return 0 for @_; 1 } # Initialisation. my $loadIncreased = 0; -my ($localSystem, $printBuildTrace) = @ARGV; +my ($localSystem, $maxSilentTime, $printBuildTrace, $buildTimeout) = @ARGV; my $currentLoad = $ENV{"NIX_CURRENT_LOAD"}; my $conf = $ENV{"NIX_REMOTE_SYSTEMS"}; @@ -261,7 +261,8 @@ close UPLOADLOCK; # Perform the build. my $buildFlags = - " --fallback --add-root $rootsDir/\$PPID.out --quiet" + "--max-silent-time $maxSilentTime --option build-timeout $buildTimeout" + . " --fallback --add-root $rootsDir/\$PPID.out --quiet" . " --option build-keep-log false"; # We let the remote side kill its process group when the connection is diff --git a/src/libstore/build.cc b/src/libstore/build.cc index 30fbfb8a3a54..1ca99dcc5cd4 100644 --- a/src/libstore/build.cc +++ b/src/libstore/build.cc @@ -695,7 +695,9 @@ HookInstance::HookInstance() throw SysError("dupping builder's stdout/stderr"); 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); @@ -1679,7 +1681,7 @@ HookReply DerivationGoal::tryBuildHook() set<int> fds; fds.insert(hook->fromHook.readSide); fds.insert(hook->builderOut.readSide); - worker.childStarted(shared_from_this(), hook->pid, fds, false, true); + worker.childStarted(shared_from_this(), hook->pid, fds, false, false); if (settings.printBuildTrace) printMsg(lvlError, format("@ build-started %1% - %2% %3%") |