mirror/guix
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/guix.git synced 2025-01-31 14:56:54 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: make-bootstrap: Build with gcc-7.

Browse source 
* gnu/packages/make-bootstrap.scm (gcc-for-bootstrap)[Inherit]: Inherit
from gcc-7.
[inputs]: Use package-inputs from gcc-7.
(package-with-relocatable-glibc)[native-inputs]: Have cross-gcc use
gcc-7.
(%gcc-static)[inherit]: Inherit from gcc-7.
[arguments]: Use package-arguments from gcc-7.
[inputs]: Replace isl-0.18 with isl. Use package-inputs from gcc-7.
[native-inputs]: Use package-native-inputs from gcc-7.
(%gcc-stripped)[inherit]: Inherit from gcc-7.
This commit is contained in:
Efraim Flashner 2021-06-12 23:15:57 +03:00
parent 4cbe0127a6
commit f819b46acb
No known key found for this signature in database
GPG key ID: 41AAE7DCCA3D8351
1 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
gnu/packages/make-bootstrap.scm
View file

@ -1,6 +1,6 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2017 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2017, 2021 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018, 2019 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2018, 2019 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2018, 2019, 2021 Jan (janneke) Nieuwenhuizen <janneke@gnu.org> ;;; Copyright © 2018, 2019, 2021 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
@ -94,13 +94,13 @@ (define gcc-for-bootstrap
(mlambdaq (glibc) (mlambdaq (glibc)
"Return a variant of GCC that uses the bootstrap variant of GLIBC." "Return a variant of GCC that uses the bootstrap variant of GLIBC."
(package (package
(inherit gcc-5) (inherit gcc-7)
(outputs '("out")) ;all in one so libgcc_s is easily found (outputs '("out")) ;all in one so libgcc_s is easily found
(inputs (inputs
`( ;; Distinguish the name so we can refer to it below. `( ;; Distinguish the name so we can refer to it below.
("bootstrap-libc" ,(glibc-for-bootstrap glibc)) ("bootstrap-libc" ,(glibc-for-bootstrap glibc))
("libc:static" ,(glibc-for-bootstrap glibc) "static") ("libc:static" ,(glibc-for-bootstrap glibc) "static")
,@(package-inputs gcc-5)))))) ,@(package-inputs gcc-7))))))
(define (package-with-relocatable-glibc p) (define (package-with-relocatable-glibc p)
"Return a variant of P that uses the libc as defined by "Return a variant of P that uses the libc as defined by
@ -139,7 +139,7 @@ (define (native-inputs)
(cons (search-path-specification (cons (search-path-specification
(variable "CROSS_CPLUS_INCLUDE_PATH") (variable "CROSS_CPLUS_INCLUDE_PATH")
(files '("include"))) (files '("include")))
(package-search-paths gcc-5))))) (package-search-paths gcc-7)))))
("cross-binutils" ,(cross-binutils target)) ("cross-binutils" ,(cross-binutils target))
,@(%final-inputs))) ,@(%final-inputs)))
`(("libc" ,(glibc-for-bootstrap glibc)) `(("libc" ,(glibc-for-bootstrap glibc))
@ -461,11 +461,11 @@ (define (%glibc-stripped)
(define %gcc-static (define %gcc-static
;; A statically-linked GCC, with stripped-down functionality. ;; A statically-linked GCC, with stripped-down functionality.
(package-with-relocatable-glibc (package-with-relocatable-glibc
(package (inherit gcc-5) (package (inherit gcc-7)
(name "gcc-static") (name "gcc-static")
(outputs '("out")) ; all in one (outputs '("out")) ; all in one
(arguments (arguments
(substitute-keyword-arguments (package-arguments gcc-5) (substitute-keyword-arguments (package-arguments gcc-7)
((#:modules modules %gnu-build-system-modules) ((#:modules modules %gnu-build-system-modules)
`((srfi srfi-1) `((srfi srfi-1)
(srfi srfi-26) (srfi srfi-26)
@ -515,8 +515,8 @@ (define %gcc-static
#t)))))) #t))))))
(inputs (inputs
`(("zlib:static" ,zlib "static") `(("zlib:static" ,zlib "static")
("isl:static" ,isl-0.18 "static") ("isl:static" ,isl "static")
,@(package-inputs gcc-5))) ,@(package-inputs gcc-7)))
(native-inputs (native-inputs
(if (%current-target-system) (if (%current-target-system)
`(;; When doing a Canadian cross, we need GMP/MPFR/MPC both `(;; When doing a Canadian cross, we need GMP/MPFR/MPC both
@ -529,12 +529,12 @@ (define %gcc-static
("gmp-native" ,gmp) ("gmp-native" ,gmp)
("mpfr-native" ,mpfr) ("mpfr-native" ,mpfr)
("mpc-native" ,mpc) ("mpc-native" ,mpc)
,@(package-native-inputs gcc-5)) ,@(package-native-inputs gcc-7))
(package-native-inputs gcc-5)))))) (package-native-inputs gcc-7))))))
(define %gcc-stripped (define %gcc-stripped
;; The subset of GCC files needed for bootstrap. ;; The subset of GCC files needed for bootstrap.
(package (inherit gcc-5) (package (inherit gcc-7)
(name "gcc-stripped") (name "gcc-stripped")
(build-system trivial-build-system) (build-system trivial-build-system)
(source #f) (source #f)