03/03: build-self: Default to Guile 2.2 when building a standalone Guix.

[Ludovic Courtès]

civodul pushed a commit to branch core-updates
in repository guix.

commit 1428bce348b1beff97676fce9350f6d87a2ca8a4
Author: Ludovic Courtès <address@hidden>
Date:   Fri Jul 27 11:32:59 2018 +0200

    build-self: Default to Guile 2.2 when building a standalone Guix.
    
    * build-aux/build-self.scm (build): Change #:guile-version to default to
    "2.2" when PULL-VERSION is greater than 0.
---
 build-aux/build-self.scm | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/build-aux/build-self.scm b/build-aux/build-self.scm
index d8f3ff9..edb7f5d 100644
--- a/build-aux/build-self.scm
+++ b/build-aux/build-self.scm
@@ -297,8 +297,15 @@ person's version identifier."
 ;; The procedure below is our return value.
 (define* (build source
                 #:key verbose? (version (date-version-string)) system
-                (guile-version (effective-version))
                 (pull-version 0)
+
+                ;; For the standalone Guix, default to Guile 2.2.  For old
+                ;; versions of 'guix pull' (pre-0.15.0), we have to use the
+                ;; same Guile as the current one.
+                (guile-version (if (> pull-version 0)
+                                   "2.2"
+                                   (effective-version)))
+
                 #:allow-other-keys
                 #:rest rest)
   "Return a derivation that unpacks SOURCE into STORE and compiles Scheme