TakeV/guix
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

gnu: libstdc++: Rewrite as 'make-libstdc++' package.

Browse source 
* gnu/packages/commencement.scm (libstdc++): Rewrite the package using
the 'make-libstdc++' method.
This commit is contained in:
Efraim Flashner 2017-10-06 14:09:37 +03:00
parent ac423120c0
commit 86d02fa801
No known key found for this signature in database
GPG key ID: 41AAE7DCCA3D8351
1 changed files with 23 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
gnu/packages/commencement.scm
View file

@ -690,34 +690,29 @@ (define binutils-final
(define libstdc++ (define libstdc++
;; Intermediate libstdc++ that will allow us to build the final GCC ;; Intermediate libstdc++ that will allow us to build the final GCC
;; (remember that GCC-BOOT0 cannot build libstdc++.) ;; (remember that GCC-BOOT0 cannot build libstdc++.)
;; TODO: Write in terms of 'make-libstdc++'. (let ((lib (package-with-bootstrap-guile (make-libstdc++ gcc))))
(package-with-bootstrap-guile (package
(package (inherit gcc) (inherit lib)
(name "libstdc++") (arguments
(arguments `(#:guile ,%bootstrap-guile
`(#:guile ,%bootstrap-guile #:implicit-inputs? #f
#:implicit-inputs? #f #:allowed-references ("out")
#:allowed-references ("out")
#:out-of-source? #t ;; XXX: libstdc++.so NEEDs ld.so for some reason.
#:phases (alist-cons-before #:validate-runpath? #f
'configure 'chdir
(lambda _ ;; All of the package arguments from 'make-libstdc++
(chdir "libstdc++-v3")) ;; except for the configure-flags.
%standard-phases) ,@(package-arguments lib)
#:configure-flags `("--disable-shared" #:configure-flags `("--disable-shared"
"--disable-libstdcxx-threads" "--disable-libstdcxx-threads"
"--disable-libstdcxx-pch" "--disable-libstdcxx-pch"
,(string-append "--with-gxx-include-dir=" ,(string-append "--with-gxx-include-dir="
(assoc-ref %outputs "out") (assoc-ref %outputs "out")
"/include" "/include"))))
;; "/include/c++/" (outputs '("out"))
;; ,(package-version gcc) (inputs %boot2-inputs)
)))) (synopsis "GNU C++ standard library (intermediate)"))))
(outputs '("out"))
(inputs %boot2-inputs)
(native-inputs '())
(propagated-inputs '())
(synopsis "GNU C++ standard library (intermediate)"))))
(define zlib-final (define zlib-final
;; Zlib used by GCC-FINAL. ;; Zlib used by GCC-FINAL.