diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2018-07-27 11:32:59 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2018-07-27 11:32:59 +0200 |
| commit | 1428bce348b1beff97676fce9350f6d87a2ca8a4 (patch) | |
| tree | aea83d22d35e7f6dfdbd151e9306e505697d6e34 /build-aux | |
| parent | 8bece84022752b635b28dba0b051d215bcc19fab (diff) | |
| download | gnu-guix-1428bce348b1beff97676fce9350f6d87a2ca8a4.tar gnu-guix-1428bce348b1beff97676fce9350f6d87a2ca8a4.tar.gz | |
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.
Diffstat (limited to 'build-aux')
| -rw-r--r-- | build-aux/build-self.scm | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/build-aux/build-self.scm b/build-aux/build-self.scm index d8f3ff9bb0..edb7f5d9c5 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 |