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

gnu: Switch to GCC 4.9 as the default compiler. 

* gnu/packages/commencement.scm: Replace all occurrences of "gcc-4.8" with
  "gcc-4.9".
  (gcc-boot0)[arguments]: Add --disable-libcilkrts --disable-libvtv.
This commit is contained in:
Ludovic Courtès 2015-06-04 18:05:52 +02:00
parent b15389e159
commit de4ac32527
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
gnu/packages/commencement.scm
View File

@ -147,7 +147,7 @@
(define gcc-boot0 (define gcc-boot0
(package-with-bootstrap-guile (package-with-bootstrap-guile
(package (inherit gcc-4.8) (package (inherit gcc-4.9)
(name "gcc-cross-boot0") (name "gcc-cross-boot0")
(arguments (arguments
`(#:guile ,%bootstrap-guile `(#:guile ,%bootstrap-guile
@ -157,7 +157,7 @@
(ice-9 regex) (ice-9 regex)
(srfi srfi-1) (srfi srfi-1)
(srfi srfi-26)) (srfi srfi-26))
,@(substitute-keyword-arguments (package-arguments gcc-4.8) ,@(substitute-keyword-arguments (package-arguments gcc-4.9)
((#:configure-flags flags) ((#:configure-flags flags)
`(append (list ,(string-append "--target=" (boot-triplet)) `(append (list ,(string-append "--target=" (boot-triplet))
@ -179,6 +179,8 @@
"--disable-libsanitizer" "--disable-libsanitizer"
"--disable-libitm" "--disable-libitm"
"--disable-libgomp" "--disable-libgomp"
"--disable-libcilkrts"
"--disable-libvtv"
"--disable-libssp" "--disable-libssp"
"--disable-libquadmath" "--disable-libquadmath"
"--disable-decimal-float") "--disable-decimal-float")
@ -218,7 +220,7 @@
(with-directory-excursion (with-directory-excursion
(string-append out "/lib/gcc/" (string-append out "/lib/gcc/"
,(boot-triplet) ,(boot-triplet)
"/" ,(package-version gcc-4.8)) "/" ,(package-version gcc-4.9))
(symlink "libgcc.a" "libgcc_eh.a")))) (symlink "libgcc.a" "libgcc_eh.a"))))
,phases)))))) ,phases))))))
@ -234,7 +236,7 @@
;; No need for Texinfo at this stage. ;; No need for Texinfo at this stage.
(native-inputs (alist-delete "texinfo" (native-inputs (alist-delete "texinfo"
(package-native-inputs gcc-4.8)))))) (package-native-inputs gcc-4.9))))))
(define perl-boot0 (define perl-boot0
(package-with-bootstrap-guile (package-with-bootstrap-guile
@ -333,7 +335,7 @@
(define (cross-gcc-wrapper gcc binutils glibc bash) (define (cross-gcc-wrapper gcc binutils glibc bash)
"Return a wrapper for the pseudo-cross toolchain GCC/BINUTILS/GLIBC "Return a wrapper for the pseudo-cross toolchain GCC/BINUTILS/GLIBC
that makes it available under the native tool names." that makes it available under the native tool names."
(package (inherit gcc-4.8) (package (inherit gcc-4.9)
(name (string-append (package-name gcc) "-wrapped")) (name (string-append (package-name gcc) "-wrapped"))
(source #f) (source #f)
(build-system trivial-build-system) (build-system trivial-build-system)
@ -500,7 +502,7 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%"
;; 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++.)
(package-with-bootstrap-guile (package-with-bootstrap-guile
(package (inherit gcc-4.8) (package (inherit gcc-4.9)
(name "libstdc++") (name "libstdc++")
(arguments (arguments
`(#:guile ,%bootstrap-guile `(#:guile ,%bootstrap-guile
@ -519,7 +521,7 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%"
(assoc-ref %outputs "out") (assoc-ref %outputs "out")
"/include" "/include"
;; "/include/c++/" ;; "/include/c++/"
;; ,(package-version gcc-4.8) ;; ,(package-version gcc-4.9)
)))) ))))
(outputs '("out")) (outputs '("out"))
(inputs %boot2-inputs) (inputs %boot2-inputs)
@ -548,7 +550,7 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%"
;; doesn't honor $LIBRARY_PATH, which breaks `gnu-build-system'.) ;; doesn't honor $LIBRARY_PATH, which breaks `gnu-build-system'.)
,@(substitute-keyword-arguments (package-arguments gcc-boot0) ,@(substitute-keyword-arguments (package-arguments gcc-boot0)
((#:configure-flags boot-flags) ((#:configure-flags boot-flags)
(let loop ((args (package-arguments gcc-4.8))) (let loop ((args (package-arguments gcc-4.9)))
(match args (match args
((#:configure-flags normal-flags _ ...) ((#:configure-flags normal-flags _ ...)
normal-flags) normal-flags)