gnu: gcc: Add Texinfo to the native inputs.

* gnu/packages/gcc.scm (gcc-4.7): Add `native-inputs' field.
  (gcc-4.8): Remove outdated comment.
* gnu/packages/base.scm (gcc-boot0): Add `native-inputs' field.
This commit is contained in:
Ludovic Courtès 2013-07-06 18:08:29 +02:00
parent 3a4ebc1124
commit c8ebc82187
2 changed files with 10 additions and 2 deletions

View file

@ -756,7 +756,11 @@ (define gcc-boot0
;; Call it differently so that the builder can check whether
;; the "libc" input is #f.
("libc-native" ,@(assoc-ref %boot0-inputs "libc"))
,@(alist-delete "libc" %boot0-inputs))))))
,@(alist-delete "libc" %boot0-inputs)))
;; No need for Texinfo at this stage.
(native-inputs (alist-delete "texinfo"
(package-native-inputs gcc-4.7))))))
(define linux-libre-headers-boot0
(package-with-bootstrap-guile

View file

@ -23,6 +23,7 @@ (define-module (gnu packages gcc)
#:use-module (gnu packages bootstrap)
#:use-module (gnu packages compression)
#:use-module (gnu packages multiprecision)
#:use-module (gnu packages texinfo)
#:use-module (guix packages)
#:use-module (guix download)
#:use-module (guix build-system gnu)
@ -104,6 +105,10 @@ (define-public gcc-4.7
("cloog" ,cloog)
("libelf" ,libelf)
("zlib" ,zlib)))
;; GCC is one of the few packages that doesn't ship .info files.
(native-inputs `(("texinfo" ,texinfo)))
(arguments
`(#:out-of-source? #t
#:strip-binaries? ,stripped?
@ -199,7 +204,6 @@ (define-public gcc-4.7
(home-page "http://gcc.gnu.org/"))))
(define-public gcc-4.8
;; FIXME: Move to gcc.scm when Binutils is updated.
(package (inherit gcc-4.7)
(version "4.8.0")
(source (origin