diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2013-11-23 22:30:10 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2013-11-23 22:30:10 +0100 |
| commit | 53c85e97dcc264da5ff5cd4e3be4d47028f4d726 (patch) | |
| tree | 8984fefeb61e0c165bf960fdfa3cd11355d02ba3 /gnu/packages/cross-base.scm | |
| parent | 2e838890ff989128e8a78eea574d1ad158dd6361 (diff) | |
| parent | c320011da5e743f47220f380c818e95394f6d9c0 (diff) | |
| download | guix-patches-53c85e97dcc264da5ff5cd4e3be4d47028f4d726.tar guix-patches-53c85e97dcc264da5ff5cd4e3be4d47028f4d726.tar.gz | |
Merge branch 'core-updates'
Conflicts:
gnu/packages/gnunet.scm
Diffstat (limited to 'gnu/packages/cross-base.scm')
| -rw-r--r-- | gnu/packages/cross-base.scm | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/gnu/packages/cross-base.scm b/gnu/packages/cross-base.scm index 0731103bfa..41128b73cd 100644 --- a/gnu/packages/cross-base.scm +++ b/gnu/packages/cross-base.scm @@ -70,11 +70,11 @@ "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 @@ GCC that does not target a libc; otherwise, target that libc." (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) @@ -101,6 +101,7 @@ GCC that does not target a libc; otherwise, target that libc." "--enable-languages=c" "--disable-threads" ; libgcc, would need libc + "--disable-libatomic" "--disable-libmudflap" "--disable-libgomp" "--disable-libssp" @@ -186,7 +187,7 @@ GCC that does not target a libc; otherwise, target that libc." ("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) |