03/04: daemon: Default to '--cores=0'.

[Ludovic Courtès]

civodul pushed a commit to branch master
in repository guix.

commit 6efc160efe6b91dd2ef2b74d551411d290c3b1f6
Author: Ludovic Courtès <address@hidden>
Date:   Sun Nov 30 18:34:31 2014 +0100

    daemon: Default to '--cores=0'.
    
    Suggested by Deck Pickard <address@hidden>.
    
    * nix/nix-daemon/guix-daemon.cc (main): Set 'settings.buildCores' to 0.
    * doc/guix.texi (Invoking guix-daemon): Adjust accordingly.
---
 doc/guix.texi                 |    2 +-
 nix/nix-daemon/guix-daemon.cc |    3 +++
 2 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/doc/guix.texi b/doc/guix.texi
index 4edaa92..f313ba5 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 d1d4541..3cca120 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