01/01: hydra: Fix uses of 'eval-when'.

[Ludovic Courtès]

civodul pushed a commit to branch master
in repository guix.

commit df154c05dc65025eac2d14ab45699b34c7a1c7c8
Author: Ludovic Courtès <address@hidden>
Date:   Mon Apr 9 00:00:58 2018 +0200

    hydra: Fix uses of 'eval-when'.
    
    * build-aux/hydra/gnu-system.scm: Use (expand load eval) in 'eval-when'
    clause so as to not poison a cat and to ensure %load-compiled-path is
    properly set when the 'use-modules' clauses are expanded.
    * build-aux/hydra/guix.scm: Likewise.
---
 build-aux/hydra/gnu-system.scm | 2 +-
 build-aux/hydra/guix.scm       | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/build-aux/hydra/gnu-system.scm b/build-aux/hydra/gnu-system.scm
index e5326c4..62eb957 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)
diff --git a/build-aux/hydra/guix.scm b/build-aux/hydra/guix.scm
index 659b8bf..08193ec 100644
--- a/build-aux/hydra/guix.scm
+++ b/build-aux/hydra/guix.scm
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2013, 2014, 2015, 2016, 2017 Ludovic Courtès <address@hidden>
+;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018 Ludovic Courtès 
<address@hidden>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -22,7 +22,7 @@
 ;;;
 
 ;; Attempt to use our very own Guix modules.
-(eval-when (compile load eval)
+(eval-when (expand load eval)
 
   ;; Ignore any available .go, and force recompilation.  This is because our
   ;; checkout in the store has mtime set to the epoch, and thus .go files look