maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* Sync with the trunk.

Browse source
This commit is contained in:
Eelco Dolstra 2010-08-24 09:56:28 +00:00
commit 955d11aae7
12 changed files with 114 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/libstore/remote-store.cc
View file

@ -198,6 +198,9 @@ void RemoteStore::setOptions()
writeInt(logType, to);
writeInt(printBuildTrace, to);
}
if (GET_PROTOCOL_MINOR(daemonVersion) >= 6) {
writeInt(buildCores, to);
}
processStderr();
}

2
src/libstore/worker-protocol.hh
View file

@ -8,7 +8,7 @@ namespace nix {
#define WORKER_MAGIC_1 0x6e697863
#define WORKER_MAGIC_2 0x6478696f
#define PROTOCOL_VERSION 0x105
#define PROTOCOL_VERSION 0x106
#define GET_PROTOCOL_MAJOR(x) ((x) & 0xff00)
#define GET_PROTOCOL_MINOR(x) ((x) & 0x00ff)