diff options
author | Ludovic Courtès <ludo@gnu.org> | 2013-01-11 16:01:49 +0100 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2013-01-11 16:01:49 +0100 |
commit | 01e354eb83299d00ddd6ba4beb73bac8130beeae (patch) | |
tree | 03368edd8462d818334bec458cd04dc1de4750a1 /distro/packages/linux.scm | |
parent | bfe384cc4c7e56ac1eceff8b5d92e916507436eb (diff) | |
parent | 28e55604212c01884a77a4f5eb66294c4957c48a (diff) | |
download | guix-patches-01e354eb83299d00ddd6ba4beb73bac8130beeae.tar guix-patches-01e354eb83299d00ddd6ba4beb73bac8130beeae.tar.gz |
Merge branch 'core-updates'
Conflicts:
guix/build/union.scm
Diffstat (limited to 'distro/packages/linux.scm')
-rw-r--r-- | distro/packages/linux.scm | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/distro/packages/linux.scm b/distro/packages/linux.scm index 62bdefb1da..a40cc27c3e 100644 --- a/distro/packages/linux.scm +++ b/distro/packages/linux.scm @@ -33,8 +33,13 @@ (define-public linux-libre-headers (let* ((version* "3.3.8") (build-phase - '(lambda* (#:key outputs #:allow-other-keys) - (setenv "ARCH" "x86_64") ; XXX + '(lambda* (#:key system #:allow-other-keys) + (let ((arch (car (string-split system #\-)))) + (setenv "ARCH" + (cond ((string=? arch "i686") "i386") + (else arch))) + (format #t "`ARCH' set to `~a'~%" (getenv "ARCH"))) + (and (zero? (system* "make" "defconfig")) (zero? (system* "make" "mrproper" "headers_check"))))) (install-phase @@ -193,4 +198,4 @@ providing the system administrator with some help in common tasks.") "Tools for working with USB devices, such as lsusb") (description "Tools for working with USB devices, such as lsusb.") - (license gpl2+)))
\ No newline at end of file + (license gpl2+))) |