puck/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

Remove the check against concurrent builds in the same process

Browse source
This commit is contained in:
Eelco Dolstra 2018-10-02 11:24:54 +02:00
parent f7ce80f90a
commit 95c727caef
No known key found for this signature in database
GPG key ID: 8170B4726D7198DE
1 changed files with 0 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/libstore/build.cc
View file

@ -4138,9 +4138,6 @@ void SubstitutionGoal::handleEOF(int fd)
////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////
static bool working = false;
Worker::Worker(LocalStore & store) Worker::Worker(LocalStore & store)
: act(*logger, actRealise) : act(*logger, actRealise)
, actDerivations(*logger, actBuilds) , actDerivations(*logger, actBuilds)
@ -4148,8 +4145,6 @@ Worker::Worker(LocalStore & store)
, store(store) , store(store)
{ {
/* Debugging: prevent recursive workers. */ /* Debugging: prevent recursive workers. */
if (working) abort();
working = true;
nrLocalBuilds = 0; nrLocalBuilds = 0;
lastWokenUp = steady_time_point::min(); lastWokenUp = steady_time_point::min();
permanentFailure = false; permanentFailure = false;
@ -4161,8 +4156,6 @@ Worker::Worker(LocalStore & store)
Worker::~Worker() Worker::~Worker()
{ {
working = false;
/* Explicitly get rid of all strong pointers now. After this all /* Explicitly get rid of all strong pointers now. After this all
goals that refer to this worker should be gone. (Otherwise we goals that refer to this worker should be gone. (Otherwise we
are in trouble, since goals may call childTerminated() etc. in are in trouble, since goals may call childTerminated() etc. in