diff options
| author | David Thompson <dthompson2@worcester.edu> | 2015-05-20 18:48:10 -0400 |
|---|---|---|
| committer | David Thompson <dthompson2@worcester.edu> | 2015-05-21 08:29:47 -0400 |
| commit | 2d977638c9a6d8779b01042b0f085da5b26affa9 (patch) | |
| tree | aac78ed5ccbc90097fbff752a7c08961e70c5064 | |
| parent | 4d043ab6283cb15e2f0cd0847a38ccf3604aab66 (diff) | |
| download | guix-2d977638c9a6d8779b01042b0f085da5b26affa9.tar guix-2d977638c9a6d8779b01042b0f085da5b26affa9.tar.gz | |
scripts: Move 'set-build-options-from-command-line*' to (guix scripts build) module.
* guix/scripts/build.scm (set-build-options-from-command-line*): New
procedure.
* guix/scripts/environment.scm (set-build-options-from-command-line*): Delete.
| -rw-r--r-- | guix/scripts/build.scm | 4 | ||||
| -rw-r--r-- | guix/scripts/environment.scm | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/guix/scripts/build.scm b/guix/scripts/build.scm index da71adba68..2307f76b42 100644 --- a/guix/scripts/build.scm +++ b/guix/scripts/build.scm @@ -37,6 +37,7 @@ #:autoload (guix download) (download-to-store) #:export (%standard-build-options set-build-options-from-command-line + set-build-options-from-command-line* show-build-options-help guix-build)) @@ -139,6 +140,9 @@ options handled by 'set-build-options-from-command-line', and listed in #:print-build-trace (assoc-ref opts 'print-build-trace?) #:verbosity (assoc-ref opts 'verbosity))) +(define set-build-options-from-command-line* + (store-lift set-build-options-from-command-line)) + (define %standard-build-options ;; List of standard command-line options for tools that build something. (list (option '(#\L "load-path") #t #f diff --git a/guix/scripts/environment.scm b/guix/scripts/environment.scm index f403e95f3d..d053daf02e 100644 --- a/guix/scripts/environment.scm +++ b/guix/scripts/environment.scm @@ -191,10 +191,6 @@ packages." (delete-duplicates (append-map transitive-inputs packages))) -;; TODO: Deduplicate these. -(define set-build-options-from-command-line* - (store-lift set-build-options-from-command-line)) - (define (build-inputs inputs opts) "Build the packages in INPUTS using the build options in OPTS." (let ((substitutes? (assoc-ref opts 'substitutes?)) |