guix build: Move 'set-build-options' call earlier.

* guix/scripts/build.scm (guix-build): Move 'set-build-options' call
  before 'show-what-to-build'.
This commit is contained in:
Ludovic Courtès 2014-02-11 23:18:41 +01:00
parent d66b704b51
commit bdff90a16a
1 changed files with 5 additions and 5 deletions

View File

@ -279,11 +279,6 @@ build."
(_ #f)) (_ #f))
opts))) opts)))
(unless (assoc-ref opts 'log-file?)
(show-what-to-build store drv
#:use-substitutes? (assoc-ref opts 'substitutes?)
#:dry-run? (assoc-ref opts 'dry-run?)))
;; TODO: Add more options. ;; TODO: Add more options.
(set-build-options store (set-build-options store
#:keep-failed? (assoc-ref opts 'keep-failed?) #:keep-failed? (assoc-ref opts 'keep-failed?)
@ -294,6 +289,11 @@ build."
#:max-silent-time (assoc-ref opts 'max-silent-time) #:max-silent-time (assoc-ref opts 'max-silent-time)
#:verbosity (assoc-ref opts 'verbosity)) #:verbosity (assoc-ref opts 'verbosity))
(unless (assoc-ref opts 'log-file?)
(show-what-to-build store drv
#:use-substitutes? (assoc-ref opts 'substitutes?)
#:dry-run? (assoc-ref opts 'dry-run?)))
(cond ((assoc-ref opts 'log-file?) (cond ((assoc-ref opts 'log-file?)
(for-each (lambda (file) (for-each (lambda (file)
(let ((log (log-file store file))) (let ((log (log-file store file)))