diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2018-04-16 18:15:28 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2018-04-16 18:15:28 +0200 |
| commit | 5d904d63f4d43e3f0e4be38c5f5404e029c00a22 (patch) | |
| tree | b2893eceae99c967e0f49cdbfe084f6c7d4767c4 /build-aux/hydra/gnu-system.scm | |
| parent | bab5f3a7f62150ae009e78d03c4b1f5b1646104c (diff) | |
| parent | d0ee11b2f000c3c027fd8370bc2195266398444f (diff) | |
Merge branch 'master' into staging
Diffstat (limited to 'build-aux/hydra/gnu-system.scm')
| -rw-r--r-- | build-aux/hydra/gnu-system.scm | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/build-aux/hydra/gnu-system.scm b/build-aux/hydra/gnu-system.scm index 8178871747..62eb957f83 100644 --- a/build-aux/hydra/gnu-system.scm +++ b/build-aux/hydra/gnu-system.scm @@ -24,7 +24,7 @@ (use-modules (system base compile)) -(eval-when (compile load eval) +(eval-when (expand load eval) ;; Pre-load the compiler so we don't end up auto-compiling it. (compile #t) @@ -32,6 +32,15 @@ ;; Use our very own Guix modules. (set! %fresh-auto-compile #t) + ;; Ignore .go files except for Guile's. This is because our checkout in the + ;; store has mtime set to the epoch, and thus .go files look newer, even + ;; though they may not correspond. Use 'reverse' so that /gnu/store/…-guile + ;; comes before /run/current-system/profile. + (set! %load-compiled-path + (list + (dirname (dirname (search-path (reverse %load-compiled-path) + "ice-9/boot-9.go"))))) + (and=> (assoc-ref (current-source-location) 'filename) (lambda (file) (let ((dir (string-append (dirname file) "/../.."))) |