diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2021-02-28 21:30:50 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2021-03-30 22:48:44 +0200 |
| commit | f95fc73248e81a65e84798a344e0c781c1121f76 (patch) | |
| tree | 05bcef6f526ca38e3e1879f8fd6149c25b1c6f47 /guix/build-system/trivial.scm | |
| parent | da86e90efe796ee68ee0a5ccaf46f45cadb52336 (diff) | |
build-system: Use 'sexp->gexp' for plain sexps.
This reduces memory allocations and list traversals during 'gexp->sexp',
'gexp-inputs', etc.
* guix/build-system/cargo.scm (cargo-build): Use 'sexp->gexp' for sexps
known to not contain file-like objects. Change default #:phases to a
symbol.
* guix/build-system/cmake.scm (cmake-build, cmake-cross-build): Likewise.
* guix/build-system/copy.scm (copy-build): Likewise.
* guix/build-system/font.scm (font-build): Likewise.
* guix/build-system/glib-or-gtk.scm (glib-or-gtk-build): Likewise.
* guix/build-system/gnu.scm (%strip-flags, %strip-directories): New
variables.
(gnu-build): Use them. Use 'sexp->gexp' where appropriate.
(gnu-cross-build): Likewise.
* guix/build-system/meson.scm (meson-build): Likewise.
* guix/build-system/perl.scm (perl-build): Likewise.
* guix/build-system/python.scm (python-build): Likewise.
* guix/build-system/ruby.scm (ruby-build): Likewise.
* guix/build-system/scons.scm (scons-build): Likewise.
* guix/build-system/texlive.scm (texlive-build): Likewise.
* guix/build-system/trivial.scm (trivial-build): Likewise.
* guix/build-system/waf.scm (waf-build): Likewise.
* guix/build-system/android-ndk.scm (android-ndk-build): Likewise.
* guix/build-system/ant.scm (ant-build): Likewise.
* guix/build-system/asdf.scm (asdf-build/source, asdf-build): Likewise.
* guix/build-system/chicken.scm (chicken-build): Likewise.
* guix/build-system/clojure.scm (clojure-build): Likewise.
(source->output-path, maybe-guile->guile): Remove.
* guix/build-system/dub.scm (dub-build): Likewise.
* guix/build-system/emacs.scm (emacs-build): Likewise.
* guix/build-system/go.scm (go-build): Likewise.
* guix/build-system/haskell.scm (haskell-build): Likewise.
* guix/build-system/julia.scm (julia-build): Likewise.
* guix/build-system/linux-module.scm (linux-module-build)
(linux-module-build-cross): Likewise.
* guix/build-system/maven.scm (maven-build): Likewise.
* guix/build-system/minify.scm (minify-build): Likewise.
* guix/build-system/node.scm (node-build): Likewise.
* guix/build-system/qt.scm (qt-build, qt-cross-build): Likewise.
* guix/build-system/r.scm (r-build): Likewise.
* guix/build-system/rakudo.scm (rakudo-build): Likewise.
* guix/build-system/renpy.scm (renpy-build): Likewise.
* guix/packages.scm (patch-and-repack): Use 'sexp->gexp' when SNIPPET is
a pair.
* guix/svn-download.scm (svn-multi-fetch): Use 'sexp->gexp' for
'svn-multi-reference-locations'.
Diffstat (limited to 'guix/build-system/trivial.scm')
| -rw-r--r-- | guix/build-system/trivial.scm | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/guix/build-system/trivial.scm b/guix/build-system/trivial.scm index 0f89524231..73d452aea2 100644 --- a/guix/build-system/trivial.scm +++ b/guix/build-system/trivial.scm @@ -54,7 +54,10 @@ "Run build expression BUILDER, an expression, for SYSTEM. SOURCE is ignored." (mlet %store-monad ((guile (package->derivation (or guile (default-guile)) - system #:graft? #f))) + system #:graft? #f)) + (builder -> (if (pair? builder) + (sexp->gexp builder) + builder))) (gexp->derivation name (with-build-variables inputs outputs builder) #:system system #:target #f @@ -72,7 +75,10 @@ ignored." "Run build expression BUILDER, an expression, for SYSTEM. SOURCE is ignored." (mlet %store-monad ((guile (package->derivation (or guile (default-guile)) - system #:graft? #f))) + system #:graft? #f)) + (builder -> (if (pair? builder) + (sexp->gexp builder) + builder))) (gexp->derivation name (with-build-variables (append build-inputs target-inputs) outputs |