From 4ca968eb954c0a8c166c8cd390024cdafdb9e416 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 21 Jun 2013 00:32:07 +0200 Subject: build-system/gnu: Save `environment-variables' after each phase. * guix/build/gnu-build-system.scm (set-paths): Move `system' call to... (gnu-build): ... here. --- guix/build/gnu-build-system.scm | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) (limited to 'guix/build') diff --git a/guix/build/gnu-build-system.scm b/guix/build/gnu-build-system.scm index 4245f2aefd..8ccf27a1b1 100644 --- a/guix/build/gnu-build-system.scm +++ b/guix/build/gnu-build-system.scm @@ -87,8 +87,7 @@ (define native-input-directories #:separator separator))) native-search-paths)) - ;; Dump the environment variables as a shell script, for handy debugging. - (system "export > environment-variables")) + #t) (define* (unpack #:key source #:allow-other-keys) (and (zero? (system* "tar" "xvf" source)) @@ -316,10 +315,13 @@ (define* (gnu-build #:key (source #f) (outputs #f) (inputs #f) (every (match-lambda ((name . proc) (let ((start (gettimeofday))) - (format #t "starting phase `~a'~%" name) - (let ((result (apply proc args)) - (end (gettimeofday))) - (format #t "phase `~a' ~:[failed~;succeeded~] after ~a seconds~%" - name result (- (car end) (car start))) - result)))) + (format #t "starting phase `~a'~%" name) + (let ((result (apply proc args)) + (end (gettimeofday))) + (format #t "phase `~a' ~:[failed~;succeeded~] after ~a seconds~%" + name result (- (car end) (car start))) + + ;; Dump the environment variables as a shell script, for handy debugging. + (system "export > $NIX_BUILD_TOP/environment-variables") + result)))) phases)) -- cgit v1.2.3