diff options
| author | Federico Beffa <beffa@fbengineering.ch> | 2015-03-28 20:09:37 +0100 |
|---|---|---|
| committer | Federico Beffa <beffa@fbengineering.ch> | 2015-04-04 09:11:30 +0200 |
| commit | 5868a8bf9debed5cc3e62da23cf042189f7f7f69 (patch) | |
| tree | bc5e3fbd614d23a1d5bbad7bc35118f90a873527 | |
| parent | c985cfe624dd388ef342399360e308386fe8c94f (diff) | |
| download | patches-5868a8bf9debed5cc3e62da23cf042189f7f7f69.tar patches-5868a8bf9debed5cc3e62da23cf042189f7f7f69.tar.gz | |
gnu: ghc: Fix i686 build.
* gnu/packages/haskell.scm (ghc-bootstrap-7.8.4): Replace with ...
(ghc-bootstrap-i686-7.8.4, ghc-bootstrap-x86_64-7.8.4): ... these.
(ghc)[native-inputs]: Select the appropriate bootstrap.
| -rw-r--r-- | gnu/packages/haskell.scm | 30 |
1 files changed, 17 insertions, 13 deletions
diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 183d0eb4cb..beecccb3bf 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -33,22 +33,23 @@ #:use-module (gnu packages ncurses) #:use-module (gnu packages python)) -;; We use bootstrap binaries with a fix version which can be used to build -;; more versions of the GHC compiler. -(define ghc-bootstrap-7.8.4 +(define ghc-bootstrap-x86_64-7.8.4 (origin (method url-fetch) - (uri (string-append "https://www.haskell.org/ghc/dist/" - "7.8.4/ghc-7.8.4-" - (if (string-match "x86_64" (%current-system)) - "x86_64" - "i386") - "-unknown-linux-deb7.tar.xz")) + (uri + "https://www.haskell.org/ghc/dist/7.8.4/ghc-7.8.4-x86_64-unknown-linux-deb7.tar.xz") (sha256 (base32 - (if (string-match "x86_64" (%current-system)) - "13azsl53xgj20mi1hj9x0xb32vvcvs6cpmvwx6znxhas7blh0bpn" - "0wj5s435j0zgww70bj1d3f6wvnnpzlxwvwcyh2qv4qjq5z8j64kg"))))) + "13azsl53xgj20mi1hj9x0xb32vvcvs6cpmvwx6znxhas7blh0bpn")))) + +(define ghc-bootstrap-i686-7.8.4 + (origin + (method url-fetch) + (uri + "https://www.haskell.org/ghc/dist/7.8.4/ghc-7.8.4-i386-unknown-linux-deb7.tar.xz") + (sha256 + (base32 + "0wj5s435j0zgww70bj1d3f6wvnnpzlxwvwcyh2qv4qjq5z8j64kg")))) ;; 43 tests out of 3965 fail. ;; @@ -99,7 +100,10 @@ ("ghostscript" ,ghostscript) ; for tests ("patchelf" ,patchelf) ;; GHC is built with GHC. Therefore we need bootstrap binaries. - ("ghc-binary" ,ghc-bootstrap-7.8.4))) + ("ghc-binary" + ,(if (string-match "x86_64" (or (%current-target-system) (%current-system))) + ghc-bootstrap-x86_64-7.8.4 + ghc-bootstrap-i686-7.8.4)))) (arguments `(#:test-target "test" ;; We get a smaller number of test failures by disabling parallel test |