summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2014-11-30 18:34:31 +0100
committerLudovic Courtès <ludo@gnu.org>2014-11-30 18:54:07 +0100
commit6efc160efe6b91dd2ef2b74d551411d290c3b1f6 (patch)
treec89c70794edd03e2cbd200158ab93e1835dcd464
parent5f86a66efdd07e1ff43fb280245e0b7f4744cfca (diff)
downloadpatches-6efc160efe6b91dd2ef2b74d551411d290c3b1f6.tar
patches-6efc160efe6b91dd2ef2b74d551411d290c3b1f6.tar.gz
daemon: Default to '--cores=0'.
Suggested by Deck Pickard <deck.r.pickard@gmail.com>. * nix/nix-daemon/guix-daemon.cc (main): Set 'settings.buildCores' to 0. * doc/guix.texi (Invoking guix-daemon): Adjust accordingly.
-rw-r--r--doc/guix.texi2
-rw-r--r--nix/nix-daemon/guix-daemon.cc3
2 files changed, 4 insertions, 1 deletions
diff --git a/doc/guix.texi b/doc/guix.texi
index 4edaa922e1..f313ba5db4 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -586,7 +586,7 @@ Cache build failures. By default, only successful builds are cached.
Use @var{n} CPU cores to build each derivation; @code{0} means as many
as available.
-The default value is @code{1}, but it may be overridden by clients, such
+The default value is @code{0}, but it may be overridden by clients, such
as the @code{--cores} option of @command{guix build} (@pxref{Invoking
guix build}).
diff --git a/nix/nix-daemon/guix-daemon.cc b/nix/nix-daemon/guix-daemon.cc
index d1d4541971..3cca120755 100644
--- a/nix/nix-daemon/guix-daemon.cc
+++ b/nix/nix-daemon/guix-daemon.cc
@@ -264,6 +264,9 @@ main (int argc, char *argv[])
/* Turn automatic deduplication on by default. */
settings.autoOptimiseStore = true;
+ /* Default to using as many cores as possible. */
+ settings.buildCores = 0;
+
argvSaved = argv;
try