Change .cc files to use split build headers

This commit is contained in:
John Ericson 2020-10-12 17:08:52 +00:00
parent 5a97621d6d
commit f7099965bf
6 changed files with 31 additions and 6 deletions

View file

@ -1,4 +1,6 @@
#include "build.hh" #include "derivation-goal.hh"
#include "hook-instance.hh"
#include "worker.hh"
#include "builtins.hh" #include "builtins.hh"
#include "builtins/buildenv.hh" #include "builtins/buildenv.hh"
#include "references.hh" #include "references.hh"
@ -12,6 +14,9 @@
#include "topo-sort.hh" #include "topo-sort.hh"
#include "callback.hh" #include "callback.hh"
#include <regex>
#include <queue>
#include <sys/types.h> #include <sys/types.h>
#include <sys/socket.h> #include <sys/socket.h>
#include <sys/un.h> #include <sys/un.h>
@ -140,6 +145,16 @@ DerivationGoal::~DerivationGoal()
} }
string DerivationGoal::key()
{
/* Ensure that derivations get built in order of their name,
i.e. a derivation named "aardvark" always comes before
"baboon". And substitution goals always happen before
derivation goals (due to "b$"). */
return "b$" + std::string(drvPath.name()) + "$" + worker.store.printStorePath(drvPath);
}
inline bool DerivationGoal::needsHashRewrite() inline bool DerivationGoal::needsHashRewrite()
{ {
#if __linux__ #if __linux__

View file

@ -1,4 +1,5 @@
#include "build.hh" #include "goal.hh"
#include "worker.hh"
namespace nix { namespace nix {

View file

@ -1,4 +1,5 @@
#include "build.hh" #include "globals.hh"
#include "hook-instance.hh"
namespace nix { namespace nix {

View file

@ -1,4 +1,7 @@
#include "build.hh" #include "machines.hh"
#include "worker.hh"
#include "substitution-goal.hh"
#include "derivation-goal.hh"
namespace nix { namespace nix {

View file

@ -1,4 +1,5 @@
#include "build.hh" #include "worker.hh"
#include "substitution-goal.hh"
#include "nar-info.hh" #include "nar-info.hh"
#include "finally.hh" #include "finally.hh"

View file

@ -1,4 +1,8 @@
#include "build.hh" #include "machines.hh"
#include "worker.hh"
#include "substitution-goal.hh"
#include "derivation-goal.hh"
#include "hook-instance.hh"
#include <poll.h> #include <poll.h>