diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2015-06-14 23:09:39 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2015-06-15 00:09:24 +0200 |
| commit | 8dca238b15b3be6638015abf67d6bf1f87ae75e0 (patch) | |
| tree | f14586f89e26cce4ecb79c07f16c338ee73a1dc8 | |
| parent | 1a802c7ec219a62626fac1e806d4d16a0347da92 (diff) | |
| download | gnu-guix-8dca238b15b3be6638015abf67d6bf1f87ae75e0.tar gnu-guix-8dca238b15b3be6638015abf67d6bf1f87ae75e0.tar.gz | |
gnu: make-bootstrap: Switch to GCC 4.9.
* 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.
| -rw-r--r-- | gnu/packages/make-bootstrap.scm | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/gnu/packages/make-bootstrap.scm b/gnu/packages/make-bootstrap.scm index 62398dfde3..ae03b7b339 100644 --- a/gnu/packages/make-bootstrap.scm +++ b/gnu/packages/make-bootstrap.scm @@ -103,11 +103,11 @@ for `sh' in $PATH, and without nscd, and with static NSS modules." ("cross-binutils" ,(cross-binutils target)) ,@%final-inputs)) `(("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 (inputs `(("libc",(glibc-for-bootstrap)) - ,@(package-inputs gcc-4.8))))) + ,@(package-inputs gcc-4.9))))) ,@(fold alist-delete %final-inputs '("libc" "gcc"))))) (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 ;; A statically-linked GCC, with stripped-down functionality. (package-with-relocatable-glibc - (package (inherit gcc-4.8) + (package (inherit gcc-4.9) (name "gcc-static") (outputs '("out")) ; all in one (arguments @@ -398,7 +398,7 @@ for `sh' in $PATH, and without nscd, and with static NSS modules." (srfi srfi-1) (srfi srfi-26) (ice-9 regex)) - ,@(substitute-keyword-arguments (package-arguments gcc-4.8) + ,@(substitute-keyword-arguments (package-arguments gcc-4.9) ((#:guile _) #f) ((#:implicit-inputs? _) #t) ((#:configure-flags flags) @@ -422,6 +422,9 @@ for `sh' in $PATH, and without nscd, and with static NSS modules." "--disable-libsanitizer" "--disable-libitm" "--disable-libgomp" + "--disable-libcilkrts" + "--disable-libvtv" + "--disable-libbacktrace" "--disable-libssp" "--disable-libquadmath" "--disable-decimal-float") @@ -451,12 +454,12 @@ for `sh' in $PATH, and without nscd, and with static NSS modules." ("gmp-native" ,gmp) ("mpfr-native" ,mpfr) ("mpc-native" ,mpc) - ,@(package-native-inputs gcc-4.8)) - (package-native-inputs gcc-4.8)))))) + ,@(package-native-inputs gcc-4.9)) + (package-native-inputs gcc-4.9)))))) (define %gcc-stripped ;; The subset of GCC files needed for bootstrap. - (package (inherit gcc-4.8) + (package (inherit gcc-4.9) (name "gcc-stripped") (build-system trivial-build-system) (source #f) |