summaryrefslogtreecommitdiff
path: root/guix/build-system/waf.scm
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2015-04-01 15:34:19 +0200
committerLudovic Courtès <ludo@gnu.org>2015-04-01 15:34:19 +0200
commitbb42c78a23a96ef79c2b5e3b98c55eef53eac9fe (patch)
tree69f0cc446ea4a1362a7e96a236d695610b4e7a5b /guix/build-system/waf.scm
parent7be8c63e0de635f8c669dc19d7ac1d3cdbe28894 (diff)
downloadgnu-guix-bb42c78a23a96ef79c2b5e3b98c55eef53eac9fe.tar
gnu-guix-bb42c78a23a96ef79c2b5e3b98c55eef53eac9fe.tar.gz
build-system: Factorize the list of modules imported on the build side.
* guix/build-system/gnu.scm (%default-modules): Rename to... (%gnu-build-system-modules): ... this. (%default-modules): New variable. (dist-package, gnu-build): Use %GNU-BUILD-SYSTEM-MODULES for #:imported-modules. (gnu-cross-build): Likewise, and use %DEFAULT-MODULES for #:modules. * guix/build-system/cmake.scm (%cmake-build-system-modules): New variable. (cmake-build): Use it for #:imported-modules. * guix/build-system/glib-or-gtk.scm (%default-imported-modules): Rename to... (%glib-or-gtk-build-system-modules): ... this. Refer to %GNU-BUILD-SYSTEM-MODULES. Adjust uses. * guix/build-system/perl.scm (%perl-build-system-modules): New variable. (perl-build): Use it for #:imported-modules. * guix/build-system/python.scm (%python-build-system-modules): New variable. (python-build): Use it for #:imported-modules. * guix/build-system/ruby.scm (%ruby-build-system-modules): New variable. (ruby-build): Use it for #:imported-modules. * guix/build-system/waf.scm (%waf-build-system-modules): New variable. (waf-build): Use it for #:imported-modules.
Diffstat (limited to 'guix/build-system/waf.scm')
-rw-r--r--guix/build-system/waf.scm12
1 files changed, 8 insertions, 4 deletions
diff --git a/guix/build-system/waf.scm b/guix/build-system/waf.scm
index 494cb957ac..c67f649fa7 100644
--- a/guix/build-system/waf.scm
+++ b/guix/build-system/waf.scm
@@ -27,7 +27,8 @@
#:select (default-python default-python2))
#:use-module (ice-9 match)
#:use-module (srfi srfi-26)
- #:export (waf-build
+ #:export (%waf-build-system-modules
+ waf-build
waf-build-system))
;; Commentary:
@@ -38,6 +39,11 @@
;;
;; Code:
+(define %waf-build-system-modules
+ ;; Build-side modules imported by default.
+ `((guix build waf-build-system)
+ ,@%gnu-build-system-modules))
+
(define* (lower name
#:key source inputs native-inputs outputs system target
(python (default-python))
@@ -75,9 +81,7 @@
(search-paths '())
(system (%current-system))
(guile #f)
- (imported-modules '((guix build waf-build-system)
- (guix build gnu-build-system)
- (guix build utils)))
+ (imported-modules %waf-build-system-modules)
(modules '((guix build waf-build-system)
(guix build utils))))
"Build SOURCE with INPUTS. This assumes that SOURCE provides a 'waf' file