mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-11-07 15:36:20 -05:00
gnu: gcc-11: Fix patch-hurd-libpthread phase.
It didn't work when it was introduced in
08acdd0765
.
* gnu/packages/gcc.scm (gcc-11)[arguments]: Remove the procedure arguments,
and use %build-inputs rather than inputs.
* gnu/packages/commencement.scm (gcc-boot0)[native-inputs]: Add hurd-patch, as
this package inherits from gcc-11.
This commit is contained in:
parent
dc8b3ebe5d
commit
6922069bcb
2 changed files with 6 additions and 4 deletions
|
@ -2452,7 +2452,10 @@ (define gcc-boot0
|
|||
,@(alist-delete "libc" (%boot0-inputs))))
|
||||
|
||||
;; No need for the native-inputs to build the documentation at this stage.
|
||||
(native-inputs `())))
|
||||
(native-inputs
|
||||
(if (target-hurd?)
|
||||
`(("hurd-patch" ,(search-patch "gcc-11-libstdc++-hurd-libpthread.patch")))
|
||||
'()))))
|
||||
|
||||
(define perl-boot0
|
||||
(package
|
||||
|
|
|
@ -719,10 +719,9 @@ (define-public gcc-11
|
|||
(if (target-hurd?)
|
||||
`(modify-phases ,phases
|
||||
(add-after 'unpack 'patch-hurd-libpthread
|
||||
(lambda (#:key inputs)
|
||||
(lambda _
|
||||
(invoke "patch" "--force" "-p1" "-i"
|
||||
(assoc-ref inputs "hurd-patch")
|
||||
patch))))
|
||||
(assoc-ref %build-inputs "hurd-patch")))))
|
||||
phases))))
|
||||
(properties
|
||||
`((compiler-cpu-architectures
|
||||
|
|
Loading…
Reference in a new issue