mirror of
https://codeberg.org/guix/guix.git
synced 2025-10-02 02:15:12 +00:00
gnu: make-bootstrap: Update gcc-static to gcc-14, for the 64bit Hurd.
* gnu/packages/make-bootstrap.scm (%gcc-static): Use gcc-14. Update to use G-Expressions. [inputs]: Remove libstdc++ and libstdc++-headers. (%gcc-stripped): Use gcc-14. [inputs, native-inputs]: Clear fields. Change-Id: I4e6d779cb457b256d80d1882f182b72a6f7d2be2
This commit is contained in:
parent
5ffbd2015c
commit
ec8a5ec15f
1 changed files with 14 additions and 11 deletions
|
@ -488,11 +488,11 @@ for `sh' in $PATH, and without nscd, and with static NSS modules."
|
||||||
(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)
|
(package (inherit gcc-14)
|
||||||
(name "gcc-static")
|
(name "gcc-static")
|
||||||
(outputs '("out")) ; all in one
|
(outputs '("out")) ; all in one
|
||||||
(arguments
|
(arguments
|
||||||
(substitute-keyword-arguments (package-arguments gcc)
|
(substitute-keyword-arguments (package-arguments gcc-14)
|
||||||
((#:modules modules %default-gnu-modules)
|
((#:modules modules %default-gnu-modules)
|
||||||
`((srfi srfi-1)
|
`((srfi srfi-1)
|
||||||
(srfi srfi-26)
|
(srfi srfi-26)
|
||||||
|
@ -501,7 +501,7 @@ for `sh' in $PATH, and without nscd, and with static NSS modules."
|
||||||
((#:guile _) #f)
|
((#:guile _) #f)
|
||||||
((#:implicit-inputs? _) #t)
|
((#:implicit-inputs? _) #t)
|
||||||
((#:configure-flags flags)
|
((#:configure-flags flags)
|
||||||
`(append (list
|
#~(append (list
|
||||||
;; We don't need a full bootstrap here.
|
;; We don't need a full bootstrap here.
|
||||||
"--disable-bootstrap"
|
"--disable-bootstrap"
|
||||||
|
|
||||||
|
@ -526,9 +526,9 @@ for `sh' in $PATH, and without nscd, and with static NSS modules."
|
||||||
"--disable-libssp"
|
"--disable-libssp"
|
||||||
"--disable-libquadmath")
|
"--disable-libquadmath")
|
||||||
(remove (cut string-match "--(.*plugin|enable-languages)" <>)
|
(remove (cut string-match "--(.*plugin|enable-languages)" <>)
|
||||||
,flags)))
|
#$flags)))
|
||||||
((#:phases phases)
|
((#:phases phases)
|
||||||
`(modify-phases ,phases
|
#~(modify-phases #$phases
|
||||||
(add-after 'pre-configure 'remove-lgcc_s
|
(add-after 'pre-configure 'remove-lgcc_s
|
||||||
(lambda _
|
(lambda _
|
||||||
;; Remove the '-lgcc_s' added to GNU_USER_TARGET_LIB_SPEC in
|
;; Remove the '-lgcc_s' added to GNU_USER_TARGET_LIB_SPEC in
|
||||||
|
@ -538,12 +538,12 @@ for `sh' in $PATH, and without nscd, and with static NSS modules."
|
||||||
(substitute* (cons "gcc/config/rs6000/sysv4.h"
|
(substitute* (cons "gcc/config/rs6000/sysv4.h"
|
||||||
(find-files "gcc/config"
|
(find-files "gcc/config"
|
||||||
"^gnu-user.*\\.h$"))
|
"^gnu-user.*\\.h$"))
|
||||||
((" -lgcc_s}}") "}}"))
|
((" -lgcc_s}}") "}}"))))))))
|
||||||
#t))))))
|
|
||||||
(inputs
|
(inputs
|
||||||
`(("zlib:static" ,zlib "static")
|
`(("zlib:static" ,zlib "static")
|
||||||
("isl:static" ,isl "static")
|
("isl:static" ,isl "static")
|
||||||
,@(package-inputs gcc)))
|
,@(fold alist-delete (package-inputs gcc-14)
|
||||||
|
'("libstdc++" "libstdc++-headers"))))
|
||||||
(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
|
||||||
|
@ -556,17 +556,19 @@ for `sh' in $PATH, and without nscd, and with static NSS modules."
|
||||||
("gmp-native" ,gmp)
|
("gmp-native" ,gmp)
|
||||||
("mpfr-native" ,mpfr)
|
("mpfr-native" ,mpfr)
|
||||||
("mpc-native" ,mpc)
|
("mpc-native" ,mpc)
|
||||||
,@(package-native-inputs gcc))
|
,@(package-native-inputs gcc-14))
|
||||||
(package-native-inputs gcc))))))
|
(package-native-inputs gcc-14))))))
|
||||||
|
|
||||||
(define %gcc-stripped
|
(define %gcc-stripped
|
||||||
;; The subset of GCC files needed for bootstrap.
|
;; The subset of GCC files needed for bootstrap.
|
||||||
(package
|
(package
|
||||||
(inherit gcc)
|
(inherit gcc-14)
|
||||||
(name "gcc-stripped")
|
(name "gcc-stripped")
|
||||||
(build-system trivial-build-system)
|
(build-system trivial-build-system)
|
||||||
(source #f)
|
(source #f)
|
||||||
(outputs '("out")) ;only one output
|
(outputs '("out")) ;only one output
|
||||||
|
(inputs '())
|
||||||
|
(native-inputs '())
|
||||||
(arguments
|
(arguments
|
||||||
(list #:modules '((guix build utils))
|
(list #:modules '((guix build utils))
|
||||||
#:builder
|
#:builder
|
||||||
|
@ -632,6 +634,7 @@ for `sh' in $PATH, and without nscd, and with static NSS modules."
|
||||||
(propagated-inputs
|
(propagated-inputs
|
||||||
(modify-inputs (package-propagated-inputs guile)
|
(modify-inputs (package-propagated-inputs guile)
|
||||||
(replace "libgc" libgc/static-libs)))
|
(replace "libgc" libgc/static-libs)))
|
||||||
|
|
||||||
(arguments
|
(arguments
|
||||||
(substitute-keyword-arguments (package-arguments guile)
|
(substitute-keyword-arguments (package-arguments guile)
|
||||||
((#:configure-flags flags #~'())
|
((#:configure-flags flags #~'())
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue