diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2018-04-08 17:57:13 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2018-04-08 17:57:13 +0200 |
| commit | f6dfb8bb082332e3e7450d09c71b32ad5f5042c7 (patch) | |
| tree | ee0b4a1767fd5c53d7a0404ed2e443cbf7df1ef8 | |
| parent | 9fe95946118e9530504699360b1ca3507fa0360d (diff) | |
| download | guix-f6dfb8bb082332e3e7450d09c71b32ad5f5042c7.tar guix-f6dfb8bb082332e3e7450d09c71b32ad5f5042c7.tar.gz | |
hydra: Clear '%load-compiled-path' for gnu-system.scm.
On hydra.gnu.org GUILE_LOAD_COMPILED_PATH happened to be empty so we
were fine. However on GuixSD with Cuirass, we could have a conflicting
non-empty path and .go files for some of the (guix …) and (gnu …)
modules would be taken from there.
* build-aux/hydra/gnu-system.scm: Set %load-compiled-path.
| -rw-r--r-- | build-aux/hydra/gnu-system.scm | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/build-aux/hydra/gnu-system.scm b/build-aux/hydra/gnu-system.scm index 8178871747..e5326c4bbd 100644 --- a/build-aux/hydra/gnu-system.scm +++ b/build-aux/hydra/gnu-system.scm @@ -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) "/../.."))) |