guix_mirror_bot pushed a commit to branch master
in repository guix.
commit 0559a4b5472f9dc4c88240c61e7ad49a95855d6f
Author: Nicolas Graves <[email protected]>
AuthorDate: Tue Jul 8 11:26:04 2025 +0200
build-system: guile: Remove unused build defaults.
Defaults should be set in guix/build-system/guile.scm rather than
guix/build/guile-build-system.scm, to disambiguate at first sight
where those defaults are set.
* guix/build-system/guile.scm (guile-build)
<#:not-compiled-file-regexp>: Add default.
* guix/build/guile-build-system.scm (build): Remove unused keyword
defaults.
Signed-off-by: Ludovic Courtès <[email protected]>
---
guix/build-system/guile.scm | 2 +-
guix/build/guile-build-system.scm | 17 +++++------------
2 files changed, 6 insertions(+), 13 deletions(-)
diff --git a/guix/build-system/guile.scm b/guix/build-system/guile.scm
index e2ba720e9c..83386fa156 100644
--- a/guix/build-system/guile.scm
+++ b/guix/build-system/guile.scm
@@ -87,7 +87,7 @@
(search-paths '())
(system (%current-system))
(source-directory ".")
- not-compiled-file-regexp
+ (not-compiled-file-regexp #f)
(scheme-file-regexp %scheme-file-regexp)
(documentation-file-regexp %documentation-file-regexp)
;; FIXME: Turn on parallel building of Guile modules by
diff --git a/guix/build/guile-build-system.scm
b/guix/build/guile-build-system.scm
index 8934278a97..218aa2ba16 100644
--- a/guix/build/guile-build-system.scm
+++ b/guix/build/guile-build-system.scm
@@ -62,10 +62,6 @@ determined."
(substring file 0 dot)
file)))
-(define %scheme-file-regexp
- ;; Regexp to match Scheme files.
- "\\.(scm|sls)$")
-
(define* (set-locale-path #:key inputs native-inputs
#:allow-other-keys)
"Set 'GUIX_LOCPATH'."
@@ -139,14 +135,11 @@ Raise an error if one of the processes exit with
non-zero."
(force-output log-port))
(define* (build #:key outputs inputs native-inputs
- (source-directory ".")
- (compile-flags '())
- ;; FIXME: Turn on parallel building of Guile modules by
- ;; default after the non-determinism issues in the Guile byte
- ;; compiler are resolved (see bug #20272).
- (parallel-build? #f)
- (scheme-file-regexp %scheme-file-regexp)
- (not-compiled-file-regexp #f)
+ source-directory
+ compile-flags
+ parallel-build?
+ scheme-file-regexp
+ not-compiled-file-regexp
target
#:allow-other-keys)
"Build files in SOURCE-DIRECTORY that match SCHEME-FILE-REGEXP. Files
