diff options
| author | Mark H Weaver <mhw@netris.org> | 2014-12-31 03:47:40 -0500 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2015-01-07 12:34:10 -0500 |
| commit | 8eb8048432f57254e07d48ab17890cbeca50e96f (patch) | |
| tree | 71460bde05b5b2aecddb8d858c71fb56d1ee80a8 | |
| parent | 270b501ee2b1b4ea4003a60b5568fc4dcb09d9db (diff) | |
Move 'nix-system->gnu-triplet' to (guix utils) and export it.
* gnu/packages/commencement.scm (nix-system->gnu-triplet): Move to...
* guix/utils.scm (nix-system->gnu-triplet): ... here. Fix docstring typo.
| -rw-r--r-- | gnu/packages/commencement.scm | 13 | ||||
| -rw-r--r-- | guix/utils.scm | 14 |
2 files changed, 14 insertions, 13 deletions
diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 20831de997..e6d03b184f 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -122,19 +122,6 @@ ("file" ,file-boot0) ,@%bootstrap-inputs)) -(define* (nix-system->gnu-triplet - #:optional (system (%current-system)) (vendor "unknown")) - "Return an a guess of the GNU triplet corresponding to Nix system -identifier SYSTEM." - (let* ((dash (string-index system #\-)) - (arch (substring system 0 dash)) - (os (substring system (+ 1 dash)))) - (string-append arch - "-" vendor "-" - (if (string=? os "linux") - "linux-gnu" - os)))) - (define* (boot-triplet #:optional (system (%current-system))) ;; Return the triplet used to create the cross toolchain needed in the ;; first bootstrapping stage. diff --git a/guix/utils.scm b/guix/utils.scm index d0d2e8a3d4..7ac586b0aa 100644 --- a/guix/utils.scm +++ b/guix/utils.scm @@ -61,6 +61,7 @@ location-column source-properties->location + nix-system->gnu-triplet gnu-triplet->nix-system %current-system %current-target-system @@ -476,6 +477,19 @@ previous value of the keyword argument." (() (reverse before))))))) +(define* (nix-system->gnu-triplet + #:optional (system (%current-system)) (vendor "unknown")) + "Return a guess of the GNU triplet corresponding to Nix system +identifier SYSTEM." + (let* ((dash (string-index system #\-)) + (arch (substring system 0 dash)) + (os (substring system (+ 1 dash)))) + (string-append arch + "-" vendor "-" + (if (string=? os "linux") + "linux-gnu" + os)))) + (define (gnu-triplet->nix-system triplet) "Return the Nix system type corresponding to TRIPLET, a GNU triplet as returned by `config.guess'." |