summaryrefslogtreecommitdiff
path: root/build-aux
diff options
context:
space:
mode:
authorMarius Bakke <mbakke@fastmail.com>2017-12-19 01:42:40 +0100
committerMarius Bakke <mbakke@fastmail.com>2017-12-19 01:42:40 +0100
commit32cd878be0bb7e153fcaa6f3bfa2632867390ff9 (patch)
treefc1ff93949817c9d172c84d0410ac9225cad57ae /build-aux
parent753425610274ccb59cce13490c096027c61621d0 (diff)
parent98bd11cfe7b931e9c6d6bf002a8a225fb7a1025b (diff)
Merge branch 'master' into core-updates
Diffstat (limited to 'build-aux')
-rw-r--r--build-aux/build-self.scm1
-rw-r--r--build-aux/hydra/gnu-system.scm17
2 files changed, 14 insertions, 4 deletions
diff --git a/build-aux/build-self.scm b/build-aux/build-self.scm
index 6415978839..17d947bec1 100644
--- a/build-aux/build-self.scm
+++ b/build-aux/build-self.scm
@@ -267,6 +267,7 @@ Please upgrade to an intermediate version first, for instance with:
;; Closure of (guix modules).
(guix modules)
(guix memoization)
+ (guix profiling)
(guix sets))
;; Arrange so that our own (guix build …) modules are
diff --git a/build-aux/hydra/gnu-system.scm b/build-aux/hydra/gnu-system.scm
index d9b9c55d9c..04845a3e1f 100644
--- a/build-aux/hydra/gnu-system.scm
+++ b/build-aux/hydra/gnu-system.scm
@@ -22,12 +22,14 @@
;;; tool.
;;;
-;; Attempt to use our very own Guix modules.
+(use-modules (system base compile))
+
(eval-when (compile 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
- ;; newer, even though they may not correspond.
+ ;; Pre-load the compiler so we don't end up auto-compiling it.
+ (compile #t)
+
+ ;; Use our very own Guix modules.
(set! %fresh-auto-compile #t)
(and=> (assoc-ref (current-source-location) 'filename)
@@ -334,6 +336,13 @@ valid."
(parameterize ((%graft? #f))
;; Return one job for each package, except bootstrap packages.
(append-map (lambda (system)
+ (format (current-error-port)
+ "evaluating for '~a' (heap size: ~a MiB)...~%"
+ system
+ (round
+ (/ (assoc-ref (gc-stats) 'heap-size)
+ (expt 2. 20))))
+ (invalidate-derivation-caches!)
(case subset
((all)
;; Build everything, including replacements.