[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
04/06: Move 'nix-system->gnu-triplet' to (guix utils) and export it.
From: |
Mark H. Weaver |
Subject: |
04/06: Move 'nix-system->gnu-triplet' to (guix utils) and export it. |
Date: |
Wed, 07 Jan 2015 17:34:00 +0000 |
mhw pushed a commit to branch core-updates
in repository guix.
commit 8eb8048432f57254e07d48ab17890cbeca50e96f
Author: Mark H Weaver <address@hidden>
Date: Wed Dec 31 03:47:40 2014 -0500
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.
---
gnu/packages/commencement.scm | 13 -------------
guix/utils.scm | 14 ++++++++++++++
2 files changed, 14 insertions(+), 13 deletions(-)
diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index 20831de..e6d03b1 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 d0d2e8a..7ac586b 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'."
- branch core-updates updated (c9a4655 -> 24aaf2f), Mark H. Weaver, 2015/01/07
- 03/06: gnu: gcc-static: Remove -lgcc_s from GNU_USER_TARGET_LIB_SPEC., Mark H. Weaver, 2015/01/07
- 02/06: gnu: bootstrap: Fix egrep and fgrep after unpacking bootstrap binaries., Mark H. Weaver, 2015/01/07
- 04/06: Move 'nix-system->gnu-triplet' to (guix utils) and export it.,
Mark H. Weaver <=
- 01/06: gnu: bootstrap: Add support for snippets to 'package-from-tarball'., Mark H. Weaver, 2015/01/07
- 05/06: gnu: gcc: Use 'gcc-configure-flags-for-triplet' for native compilers too., Mark H. Weaver, 2015/01/07
- 06/06: gnu: gmp: Apply fixes for armhf., Mark H. Weaver, 2015/01/07