me/guix
Archived
1
0
Fork 0
Code Activity

gnu: make-bootstrap: Switch to GCC 4.9.

Browse source 
* gnu/packages/make-bootstrap.scm: Replace all occurrences of "gcc-4.8" with
  "gcc-4.9".
  (%gcc-static): Add --disable-libcilkrts, --disable-libvtv,
  --disable-libbacktrace.
This commit is contained in:
Ludovic Courtès 2015-06-14 23:09:39 +02:00
parent 1a802c7ec2
commit 8dca238b15
1 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
gnu/packages/make-bootstrap.scm
View file

@ -103,11 +103,11 @@ for `sh' in $PATH, and without nscd, and with static NSS modules."
("cross-binutils" ,(cross-binutils target)) ("cross-binutils" ,(cross-binutils target))
,@%final-inputs)) ,@%final-inputs))
`(("libc" ,(glibc-for-bootstrap)) `(("libc" ,(glibc-for-bootstrap))
("gcc" ,(package (inherit gcc-4.8) ("gcc" ,(package (inherit gcc-4.9)
(outputs '("out")) ; all in one so libgcc_s is easily found (outputs '("out")) ; all in one so libgcc_s is easily found
(inputs (inputs
`(("libc",(glibc-for-bootstrap)) `(("libc",(glibc-for-bootstrap))
,@(package-inputs gcc-4.8))))) ,@(package-inputs gcc-4.9)))))
,@(fold alist-delete %final-inputs '("libc" "gcc"))))) ,@(fold alist-delete %final-inputs '("libc" "gcc")))))
(package-with-explicit-inputs p inputs (package-with-explicit-inputs p inputs
@ -389,7 +389,7 @@ for `sh' in $PATH, and without nscd, and with static NSS modules."
(define %gcc-static (define %gcc-static
;; A statically-linked GCC, with stripped-down functionality. ;; A statically-linked GCC, with stripped-down functionality.
(package-with-relocatable-glibc (package-with-relocatable-glibc
(package (inherit gcc-4.8) (package (inherit gcc-4.9)
(name "gcc-static") (name "gcc-static")
(outputs '("out")) ; all in one (outputs '("out")) ; all in one
(arguments (arguments
@ -398,7 +398,7 @@ for `sh' in $PATH, and without nscd, and with static NSS modules."
(srfi srfi-1) (srfi srfi-1)
(srfi srfi-26) (srfi srfi-26)
(ice-9 regex)) (ice-9 regex))
,@(substitute-keyword-arguments (package-arguments gcc-4.8) ,@(substitute-keyword-arguments (package-arguments gcc-4.9)
((#:guile _) #f) ((#:guile _) #f)
((#:implicit-inputs? _) #t) ((#:implicit-inputs? _) #t)
((#:configure-flags flags) ((#:configure-flags flags)
@ -422,6 +422,9 @@ for `sh' in $PATH, and without nscd, and with static NSS modules."
"--disable-libsanitizer" "--disable-libsanitizer"
"--disable-libitm" "--disable-libitm"
"--disable-libgomp" "--disable-libgomp"
"--disable-libcilkrts"
"--disable-libvtv"
"--disable-libbacktrace"
"--disable-libssp" "--disable-libssp"
"--disable-libquadmath" "--disable-libquadmath"
"--disable-decimal-float") "--disable-decimal-float")
@ -451,12 +454,12 @@ for `sh' in $PATH, and without nscd, and with static NSS modules."
("gmp-native" ,gmp) ("gmp-native" ,gmp)
("mpfr-native" ,mpfr) ("mpfr-native" ,mpfr)
("mpc-native" ,mpc) ("mpc-native" ,mpc)
,@(package-native-inputs gcc-4.8)) ,@(package-native-inputs gcc-4.9))
(package-native-inputs gcc-4.8)))))) (package-native-inputs gcc-4.9))))))
(define %gcc-stripped (define %gcc-stripped
;; The subset of GCC files needed for bootstrap. ;; The subset of GCC files needed for bootstrap.
(package (inherit gcc-4.8) (package (inherit gcc-4.9)
(name "gcc-stripped") (name "gcc-stripped")
(build-system trivial-build-system) (build-system trivial-build-system)
(source #f) (source #f)