me/guix
Archived
1
0
Fork 0
Code Activity

gnu: Switch to GCC 4.9 as the default cross-compiler.

Browse source 
* gnu/packages/cross-base.scm: Replace all occurrences of "gcc-4.8" with
  "gcc-4.9".
This commit is contained in:
Ludovic Courtès 2015-06-04 18:07:26 +02:00
parent de4ac32527
commit 8d866b96f7
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
gnu/packages/cross-base.scm
View file

@ -86,7 +86,7 @@ may be either a libc package or #f.)"
;; Set the current target system so that 'glibc-dynamic-linker' returns the ;; Set the current target system so that 'glibc-dynamic-linker' returns the
;; right name. ;; right name.
(parameterize ((%current-target-system target)) (parameterize ((%current-target-system target))
(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=" target) `(append (list ,(string-append "--target=" target)
,@(if libc ,@(if libc
@ -194,14 +194,14 @@ may be either a libc package or #f.)"
"Return a cross-compiler for TARGET, where TARGET is a GNU triplet. Use "Return a cross-compiler for TARGET, where TARGET is a GNU triplet. Use
XBINUTILS as the associated cross-Binutils. If LIBC is false, then build a XBINUTILS as the associated cross-Binutils. If LIBC is false, then build a
GCC that does not target a libc; otherwise, target that libc." GCC that does not target a libc; otherwise, target that libc."
(package (inherit gcc-4.8) (package (inherit gcc-4.9)
(name (string-append "gcc-cross-" (name (string-append "gcc-cross-"
(if libc "" "sans-libc-") (if libc "" "sans-libc-")
target)) target))
(source (origin (inherit (package-source gcc-4.8)) (source (origin (inherit (package-source gcc-4.9))
(patches (patches
(append (append
(origin-patches (package-source gcc-4.8)) (origin-patches (package-source gcc-4.9))
(cons (search-patch "gcc-cross-environment-variables.patch") (cons (search-patch "gcc-cross-environment-variables.patch")
(cross-gcc-patches target)))))) (cross-gcc-patches target))))))
@ -231,7 +231,7 @@ GCC that does not target a libc; otherwise, target that libc."
("libc-native" ,@(assoc-ref %final-inputs "libc")) ("libc-native" ,@(assoc-ref %final-inputs "libc"))
;; Remaining inputs. ;; Remaining inputs.
,@(let ((inputs (append (package-inputs gcc-4.8) ,@(let ((inputs (append (package-inputs gcc-4.9)
(alist-delete "libc" %final-inputs)))) (alist-delete "libc" %final-inputs))))
(if libc (if libc
`(("libc" ,libc) `(("libc" ,libc)