diff options
author | Liliana Marie Prikler <liliana.prikler@gmail.com> | 2024-03-09 07:46:25 +0100 |
---|---|---|
committer | Liliana Marie Prikler <liliana.prikler@gmail.com> | 2024-03-09 07:46:25 +0100 |
commit | 058532bdd8953feefbd84fd7514822886c7f1a7e (patch) | |
tree | dd29b23b04df1e30a03b93d53a339f6fcd817285 /guix/build/guile-build-system.scm | |
parent | 19fc252ab7e86ad1443a8d16f68467c61bf23179 (diff) | |
parent | 1bc05c6f6d56ad9e0e31d7f1cc75545a65e3d0f3 (diff) | |
download | guix-058532bdd8953feefbd84fd7514822886c7f1a7e.tar guix-058532bdd8953feefbd84fd7514822886c7f1a7e.tar.gz |
Merge branch 'master' into emacs-team
Diffstat (limited to 'guix/build/guile-build-system.scm')
-rw-r--r-- | guix/build/guile-build-system.scm | 43 |
1 files changed, 21 insertions, 22 deletions
diff --git a/guix/build/guile-build-system.scm b/guix/build/guile-build-system.scm index e7e7f2d0be..8927da224a 100644 --- a/guix/build/guile-build-system.scm +++ b/guix/build/guile-build-system.scm @@ -184,39 +184,38 @@ installed; this is useful for files that are meant to be included." (#f "") (path (string-append ":" path))))) - (let ((source-files + (let ((source-files (with-directory-excursion source-directory (find-files "." scheme-file-regexp)))) - (invoke-each - (filter-map (lambda (file) - (and (or (not not-compiled-file-regexp) - (not (string-match not-compiled-file-regexp - file))) - (cons* guild - "guild" "compile" - "-L" source-directory - "-o" (string-append go-dir - (file-sans-extension file) - ".go") - (string-append source-directory "/" file) - flags))) - source-files) - #:max-processes (parallel-job-count) - #:report-progress report-build-progress) - - (for-each - (lambda (file) + (for-each + (lambda (file) (install-file (string-append source-directory "/" file) (string-append module-dir "/" (dirname file)))) - source-files)) + source-files) + (invoke-each + (filter-map (lambda (file) + (and (or (not not-compiled-file-regexp) + (not (string-match not-compiled-file-regexp + file))) + (cons* guild + "guild" "compile" + "-L" source-directory + "-o" (string-append go-dir + (file-sans-extension file) + ".go") + (string-append source-directory "/" file) + flags))) + source-files) + #:max-processes (parallel-job-count) + #:report-progress report-build-progress)) #t)) (define* (install-documentation #:key outputs (documentation-file-regexp %documentation-file-regexp) #:allow-other-keys) - "Install files that mactch DOCUMENTATION-FILE-REGEXP." + "Install files that match DOCUMENTATION-FILE-REGEXP." (let* ((out (assoc-ref outputs "out")) (doc (string-append out "/share/doc/" (strip-store-file-name out)))) |