futurile/guix-play
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gnu: ghc@8.4: Remove redundant inputs.

Browse Source 
Incidentally, this fixes a build failure where GHC's build processes fail to
link libffi and libgmp for 'ghc-cabal'.

* gnu/packages/haskell.scm (ghc-8.4)[inputs]: Remove BINUTILS, GCC, and
MAKE-LD-WRAPPER.
[arguments]: Adjust accordingly.
This commit is contained in:
Marius Bakke 2020-03-23 16:32:44 +01:00
parent d19b14c834
commit a057b88124
No known key found for this signature in database
GPG Key ID: A2A06DF2A33A54FA
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
gnu/packages/haskell.scm
View File

@ -37,10 +37,8 @@
(define-module (gnu packages haskell) (define-module (gnu packages haskell)
#:use-module (gnu packages) #:use-module (gnu packages)
#:use-module (gnu packages base)
#:use-module (gnu packages bootstrap) #:use-module (gnu packages bootstrap)
#:use-module (gnu packages elf) #:use-module (gnu packages elf)
#:use-module (gnu packages gcc)
#:use-module (gnu packages ghostscript) #:use-module (gnu packages ghostscript)
#:use-module (gnu packages libffi) #:use-module (gnu packages libffi)
#:use-module (gnu packages lisp) #:use-module (gnu packages lisp)
@ -435,11 +433,7 @@ interactive environment for the functional language Haskell.")
(inputs (inputs
`(("gmp" ,gmp) `(("gmp" ,gmp)
("ncurses" ,ncurses) ("ncurses" ,ncurses)
("libffi" ,libffi) ("libffi" ,libffi)))
("target-binutils" ,binutils)
("target-gcc" ,gcc)
("target-ld-wrapper" ,(make-ld-wrapper "ld-wrapper"
#:binutils binutils))))
(native-inputs (native-inputs
`(("perl" ,perl) `(("perl" ,perl)
("python" ,python) ; for tests ("python" ,python) ; for tests
@ -514,9 +508,9 @@ interactive environment for the functional language Haskell.")
;; plain command names. ;; plain command names.
(add-before 'configure 'set-target-programs (add-before 'configure 'set-target-programs
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(let ((binutils (assoc-ref inputs "target-binutils")) (let ((binutils (assoc-ref inputs "binutils"))
(gcc (assoc-ref inputs "target-gcc")) (gcc (assoc-ref inputs "gcc"))
(ld-wrapper (assoc-ref inputs "target-ld-wrapper"))) (ld-wrapper (assoc-ref inputs "ld-wrapper")))
(setenv "CC" (string-append gcc "/bin/gcc")) (setenv "CC" (string-append gcc "/bin/gcc"))
(setenv "CXX" (string-append gcc "/bin/g++")) (setenv "CXX" (string-append gcc "/bin/g++"))
(setenv "LD" (string-append ld-wrapper "/bin/ld")) (setenv "LD" (string-append ld-wrapper "/bin/ld"))