diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2018-12-03 08:52:17 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2018-12-03 08:52:17 +0100 |
| commit | 194451347dc60092132d06b84a83c5205d79299a (patch) | |
| tree | 828475b685c349cdd7b74c09beb7336d38bdf6f0 /build-aux/build-self.scm | |
| parent | 37c6f11f8dfa1880db86a3510c9e50990304d76c (diff) | |
| parent | 8cddb0d6363d13f74de5409ef29b7913228f49b9 (diff) | |
| download | patches-194451347dc60092132d06b84a83c5205d79299a.tar patches-194451347dc60092132d06b84a83c5205d79299a.tar.gz | |
Merge branch 'core-updates'
Diffstat (limited to 'build-aux/build-self.scm')
| -rw-r--r-- | build-aux/build-self.scm | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/build-aux/build-self.scm b/build-aux/build-self.scm index 306b2c6b63..5b281c3bc9 100644 --- a/build-aux/build-self.scm +++ b/build-aux/build-self.scm @@ -374,10 +374,15 @@ interface (FFI) of Guile.") ;; The procedure below is our return value. (define* (build source #:key verbose? (version (date-version-string)) system - (guile-version (match ((@ (guile) version)) - ("2.2.2" "2.2.2") - (_ (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 |