From 9ae7cee342db1abe9504ecba90da65c05694ab88 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 1 Nov 2013 13:04:38 +0100 Subject: gnu: Switch to GCC 4.8 as the default compiler. * gnu/packages/base.scm (gcc-boot0, cross-gcc-wrapper, gcc-final): Base on GCC-4.8. * gnu/packages/cross-base.scm (cross-gcc): Likewise. * gnu/packages/make-bootstrap.scm (package-with-relocatable-glibc, %gcc-static, %gcc-stripped): Likewise. --- gnu/packages/base.scm | 12 ++++++------ gnu/packages/cross-base.scm | 8 ++++---- gnu/packages/make-bootstrap.scm | 12 ++++++------ 3 files changed, 16 insertions(+), 16 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index f89d618cdf..f1c43cf288 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -642,7 +642,7 @@ (define binutils-boot0 (define gcc-boot0 (package-with-bootstrap-guile - (package (inherit gcc-4.7) + (package (inherit gcc-4.8) (name "gcc-cross-boot0") (arguments `(#:guile ,%bootstrap-guile @@ -652,7 +652,7 @@ (define gcc-boot0 (ice-9 regex) (srfi srfi-1) (srfi srfi-26)) - ,@(substitute-keyword-arguments (package-arguments gcc-4.7) + ,@(substitute-keyword-arguments (package-arguments gcc-4.8) ((#:configure-flags flags) `(append (list ,(string-append "--target=" (boot-triplet)) @@ -716,7 +716,7 @@ (define gcc-boot0 (with-directory-excursion (string-append out "/lib/gcc/" ,(boot-triplet) - "/" ,(package-version gcc-4.7)) + "/" ,(package-version gcc-4.8)) (symlink "libgcc.a" "libgcc_eh.a")))) ,phases)))))) @@ -732,7 +732,7 @@ (define gcc-boot0 ;; No need for Texinfo at this stage. (native-inputs (alist-delete "texinfo" - (package-native-inputs gcc-4.7)))))) + (package-native-inputs gcc-4.8)))))) (define (linux-libre-headers-boot0) "Return Linux-Libre header files for the bootstrap environment." @@ -798,7 +798,7 @@ (define glibc-final-with-bootstrap-bash (define (cross-gcc-wrapper gcc binutils glibc bash) "Return a wrapper for the pseudo-cross toolchain GCC/BINUTILS/GLIBC that makes it available under the native tool names." - (package (inherit gcc-4.7) + (package (inherit gcc-4.8) (name (string-append (package-name gcc) "-wrapped")) (source #f) (build-system trivial-build-system) @@ -904,7 +904,7 @@ (define-public gcc-final ;; doesn't honor $LIBRARY_PATH, which breaks `gnu-build-system'.) ,@(substitute-keyword-arguments (package-arguments gcc-boot0) ((#:configure-flags boot-flags) - (let loop ((args (package-arguments gcc-4.7))) + (let loop ((args (package-arguments gcc-4.8))) (match args ((#:configure-flags normal-flags _ ...) normal-flags) diff --git a/gnu/packages/cross-base.scm b/gnu/packages/cross-base.scm index 0731103bfa..9633e2cbfd 100644 --- a/gnu/packages/cross-base.scm +++ b/gnu/packages/cross-base.scm @@ -70,11 +70,11 @@ (define* (cross-gcc target "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 GCC that does not target a libc; otherwise, target that libc." - (package (inherit gcc-4.7) + (package (inherit gcc-4.8) (name (string-append "gcc-cross-" (if libc "" "sans-libc-") target)) - (source (origin (inherit (package-source gcc-4.7)) + (source (origin (inherit (package-source gcc-4.8)) (patches (list (search-patch "gcc-cross-environment-variables.patch"))))) (arguments @@ -85,7 +85,7 @@ (define* (cross-gcc target (srfi srfi-1) (srfi srfi-26)) - ,@(substitute-keyword-arguments (package-arguments gcc-4.7) + ,@(substitute-keyword-arguments (package-arguments gcc-4.8) ((#:configure-flags flags) `(append (list ,(string-append "--target=" target) ,@(gcc-configure-flags-for-triplet target) @@ -186,7 +186,7 @@ (define (cross? x) ("libc-native" ,@(assoc-ref %final-inputs "libc")) ;; Remaining inputs. - ,@(let ((inputs (append (package-inputs gcc-4.7) + ,@(let ((inputs (append (package-inputs gcc-4.8) (alist-delete "libc" %final-inputs)))) (if libc `(("libc" ,libc) diff --git a/gnu/packages/make-bootstrap.scm b/gnu/packages/make-bootstrap.scm index 8c148f7086..708cb39bb2 100644 --- a/gnu/packages/make-bootstrap.scm +++ b/gnu/packages/make-bootstrap.scm @@ -94,10 +94,10 @@ (define (native-inputs) ("cross-binutils" ,(cross-binutils target)) ,@%final-inputs)) `(("libc" ,(glibc-for-bootstrap)) - ("gcc" ,(package (inherit gcc-4.7) + ("gcc" ,(package (inherit gcc-4.8) (inputs `(("libc",(glibc-for-bootstrap)) - ,@(package-inputs gcc-4.7))))) + ,@(package-inputs gcc-4.8))))) ,@(fold alist-delete %final-inputs '("libc" "gcc"))))) (package-with-explicit-inputs p inputs @@ -378,7 +378,7 @@ (define %glibc-stripped (define %gcc-static ;; A statically-linked GCC, with stripped-down functionality. (package-with-relocatable-glibc - (package (inherit gcc-4.7) + (package (inherit gcc-4.8) (name "gcc-static") (arguments `(#:modules ((guix build utils) @@ -386,7 +386,7 @@ (define %gcc-static (srfi srfi-1) (srfi srfi-26) (ice-9 regex)) - ,@(substitute-keyword-arguments (package-arguments gcc-4.7) + ,@(substitute-keyword-arguments (package-arguments gcc-4.8) ((#:guile _) #f) ((#:implicit-inputs? _) #t) ((#:configure-flags flags) @@ -409,11 +409,11 @@ (define %gcc-static ("mpfr-source" ,(package-source mpfr)) ("mpc-source" ,(package-source mpc)) ("binutils" ,binutils) - ,@(package-inputs gcc-4.7)))))) + ,@(package-inputs gcc-4.8)))))) (define %gcc-stripped ;; The subset of GCC files needed for bootstrap. - (package (inherit gcc-4.7) + (package (inherit gcc-4.8) (name "gcc-stripped") (build-system trivial-build-system) (source #f) -- cgit v1.2.3