diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2015-06-30 17:42:35 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2015-07-01 23:29:49 +0200 |
| commit | ce367ef3a9031e3211d616630ff01c8a6128db96 (patch) | |
| tree | bdb7af923ad304395a701faf5b38adc49f8dd755 /guix/scripts/environment.scm | |
| parent | 6b6298ae39bfe185ce1ab18bb3d641ddfad17c8f (diff) | |
environment: Add --system.
* guix/scripts/environment.scm (show-help, %options): Add -s/--system.
(%default-options): Add 'system' pair.
(guix-environment): Pass 'system' value from OPTS to 'lower-inputs'.
* doc/guix.texi (Invoking guix environment): Document it.
Diffstat (limited to 'guix/scripts/environment.scm')
| -rw-r--r-- | guix/scripts/environment.scm | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/guix/scripts/environment.scm b/guix/scripts/environment.scm index e2ac086f6d..7a7664a1ea 100644 --- a/guix/scripts/environment.scm +++ b/guix/scripts/environment.scm @@ -115,6 +115,8 @@ shell command in that environment.\n")) --pure unset existing environment variables")) (display (_ " --search-paths display needed environment variable definitions")) + (display (_ " + -s, --system=SYSTEM attempt to build for SYSTEM--e.g., \"i686-linux\"")) (newline) (show-build-options-help) (newline) @@ -128,6 +130,7 @@ shell command in that environment.\n")) (define %default-options ;; Default to opening a new shell. `((exec . ,(or (getenv "SHELL") "/bin/sh")) + (system . ,(%current-system)) (substitutes? . #t) (max-silent-time . 3600) (verbosity . 0))) @@ -162,6 +165,10 @@ shell command in that environment.\n")) (option '(#\n "dry-run") #f #f (lambda (opt name arg result) (alist-cons 'dry-run? #t result))) + (option '(#\s "system") #t #f + (lambda (opt name arg result) + (alist-cons 'system arg + (alist-delete 'system result eq?)))) %standard-build-options)) (define (pick-all alist key) @@ -243,7 +250,7 @@ OUTPUT) tuples, using the build options in OPTS." ((label item output) (list item output))) inputs) - #:system (%current-system)))) + #:system (assoc-ref opts 'system)))) (mbegin %store-monad ;; First build INPUTS. This is necessary even for ;; --search-paths. |