diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2019-10-01 11:49:17 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2019-10-01 12:06:00 +0200 |
| commit | 0cf2b6f2dbcd299f7a4b7a563cf34ae5de154b15 (patch) | |
| tree | 0b653bb411222fda1d159cb05bee722ff8bac9cc /guix/build | |
| parent | 8d564b8b81b98fec9aac2f5f2d3cb0d1f2ea1416 (diff) | |
| parent | 717b6ba6aa9ac876b2c2df36096e4579b19ee06c (diff) | |
Merge branch 'master' into core-updates
Diffstat (limited to 'guix/build')
| -rw-r--r-- | guix/build/compile.scm | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/guix/build/compile.scm b/guix/build/compile.scm index c127456fd0..06ed57c9d7 100644 --- a/guix/build/compile.scm +++ b/guix/build/compile.scm @@ -169,11 +169,12 @@ BUILD-DIRECTORY, using up to WORKERS parallel workers. The resulting object files are for HOST, a GNU triplet such as \"x86_64-linux-gnu\"." (define progress-lock (make-mutex)) (define total (length files)) - (define completed 0) + (define progress 0) (define (build file) (with-mutex progress-lock - (report-compilation file total completed)) + (report-compilation file total progress) + (set! progress (+ 1 progress))) ;; Exit as soon as something goes wrong. (exit-on-exception @@ -185,9 +186,7 @@ files are for HOST, a GNU triplet such as \"x86_64-linux-gnu\"." #:output-file (string-append build-directory "/" (scm->go relative)) #:opts (append warning-options - (optimization-options relative))))))) - (with-mutex progress-lock - (set! completed (+ 1 completed)))) + (optimization-options relative)))))))) (with-augmented-search-path %load-path source-directory (with-augmented-search-path %load-compiled-path build-directory |