aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEelco Dolstra <edolstra@gmail.com>2018-10-02 11:24:54 +0200
committerEelco Dolstra <edolstra@gmail.com>2019-10-29 12:43:20 +0100
commit95c727caef110c03900a77133eb3e873fca7f019 (patch)
tree093791274ddc9cc29865b8883dceb261ca3e87be
parentf7ce80f90ab364058e28989af68ba993fd8180a9 (diff)
Remove the check against concurrent builds in the same process
-rw-r--r--src/libstore/build.cc7
1 files changed, 0 insertions, 7 deletions
diff --git a/src/libstore/build.cc b/src/libstore/build.cc
index 886c864a3..dfae8024a 100644
--- a/src/libstore/build.cc
+++ b/src/libstore/build.cc
@@ -4138,9 +4138,6 @@ void SubstitutionGoal::handleEOF(int fd)
//////////////////////////////////////////////////////////////////////
-static bool working = false;
-
-
Worker::Worker(LocalStore & store)
: act(*logger, actRealise)
, actDerivations(*logger, actBuilds)
@@ -4148,8 +4145,6 @@ Worker::Worker(LocalStore & store)
, store(store)
{
/* Debugging: prevent recursive workers. */
- if (working) abort();
- working = true;
nrLocalBuilds = 0;
lastWokenUp = steady_time_point::min();
permanentFailure = false;
@@ -4161,8 +4156,6 @@ Worker::Worker(LocalStore & store)
Worker::~Worker()
{
- working = false;
-
/* Explicitly get rid of all strong pointers now. After this all
goals that refer to this worker should be gone. (Otherwise we
are in trouble, since goals may call childTerminated() etc. in