diff options
| author | David Craven <david@craven.ch> | 2016-09-02 17:10:52 +0200 |
|---|---|---|
| committer | David Craven <david@craven.ch> | 2016-09-13 16:45:41 +0200 |
| commit | 6d7ef2aad29679cf5327efc35e241a0a75c7c301 (patch) | |
| tree | 68ef0574a1e8bf232c93297a5cd2e826e6e78446 | |
| parent | 614d1738e27a5a08b4d553861253d6636e431a25 (diff) | |
| download | patches-6d7ef2aad29679cf5327efc35e241a0a75c7c301.tar patches-6d7ef2aad29679cf5327efc35e241a0a75c7c301.tar.gz | |
gnu: linux-libre: Use system->architecture.
* gnu/packages/linux.scm (linux-libre): Use system->architecture.
| -rw-r--r-- | gnu/packages/linux.scm | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 4a3e1dc013..27b5f4a9dc 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -84,7 +84,7 @@ (define-public (system->linux-architecture arch) "Return the Linux architecture name for ARCH, a Guix system name such as -\"x86_64-linux\"." +\"x86_64-linux\" or a target triplet such as \"arm-linux-gnueabihf\"." (let ((arch (car (string-split arch #\-)))) (cond ((string=? arch "i686") "i386") ((string-prefix? "mips" arch) "mips") @@ -292,7 +292,7 @@ for SYSTEM and optionally VARIANT, or #f if there is no such configuration." (modify-phases %standard-phases (delete 'configure) (replace 'build - (lambda* (#:key system inputs #:allow-other-keys #:rest args) + (lambda* (#:key inputs #:allow-other-keys #:rest args) ;; Avoid introducing timestamps (setenv "KCONFIG_NOTIMESTAMP" "1") (setenv "KBUILD_BUILD_TIMESTAMP" (getenv "SOURCE_DATE_EPOCH")) @@ -301,12 +301,12 @@ for SYSTEM and optionally VARIANT, or #f if there is no such configuration." (system* "patch" "-p1" "--force" "-i" (assoc-ref inputs "patch/freedo+gnu")) - (let ((arch (car (string-split system #\-)))) - (setenv "ARCH" - (cond ((string=? arch "i686") "i386") - ((string=? arch "mips64el") "mips") - (else arch))) - (format #t "`ARCH' set to `~a'~%" (getenv "ARCH"))) + (let ((arch ,(system->linux-architecture + (or (%current-target-system) + (%current-system))))) + (setenv "ARCH" arch)) + + (format #t "`ARCH' set to `~a'~%" (getenv "ARCH")) (let ((build (assoc-ref %standard-phases 'build)) (config (assoc-ref inputs "kconfig"))) |