nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: make-bootstrap: Add C++ header files to the bootstrap GCC. 

* gnu/packages/make-bootstrap.scm (%gcc-stripped): Add $gcc/include/c++.
This commit is contained in:
Ludovic Courtès 2013-11-02 15:17:08 +01:00
parent 08928e5752
commit 55a5674f21
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gnu/packages/make-bootstrap.scm
View File

@ -429,6 +429,7 @@ for `sh' in $PATH, and without nscd, and with static NSS modules."
(let* ((out (assoc-ref %outputs "out")) (let* ((out (assoc-ref %outputs "out"))
(bindir (string-append out "/bin")) (bindir (string-append out "/bin"))
(libdir (string-append out "/lib")) (libdir (string-append out "/lib"))
(includedir (string-append out "/include"))
(libexecdir (string-append out "/libexec")) (libexecdir (string-append out "/libexec"))
(gcc (assoc-ref %build-inputs "gcc"))) (gcc (assoc-ref %build-inputs "gcc")))
(copy-recursively (string-append gcc "/bin") bindir) (copy-recursively (string-append gcc "/bin") bindir)
@ -444,6 +445,11 @@ for `sh' in $PATH, and without nscd, and with static NSS modules."
libexecdir) libexecdir)
(for-each remove-store-references (for-each remove-store-references
(find-files libexecdir ".*")) (find-files libexecdir ".*"))
;; Starting from GCC 4.8, helper programs built natively
;; (‘genchecksum’, ‘gcc-nm’, etc.) rely on C++ headers.
(copy-recursively (string-append gcc "/include/c++")
(string-append includedir "/c++"))
#t)))) #t))))
(inputs `(("gcc" ,%gcc-static))))) (inputs `(("gcc" ,%gcc-static)))))