me
/
guix
Archived
1
0
Fork 0
Code

gnu: Add %final-inputs-riscv64. 

* gnu/packages/commencement.scm (%final-inputs-riscv64): New variable.
* guix/build-system/gnu.scm (standard-inputs): Use %final-inputs-riscv64
when targeting riscv64-linux.
Efraim Flashner 2022-01-24 17:13:11 +02:00
parent 90a41fe388
commit 0444be8689
No known key found for this signature in database
GPG Key ID: 41AAE7DCCA3D8351
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gnu/packages/commencement.scm
View File

@ -3,7 +3,7 @@
;;; Copyright © 2014 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2012 Nikita Karetnikov <nikita@karetnikov.org>
;;; Copyright © 2014, 2015, 2017 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2017, 2018, 2019, 2021 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2017, 2018, 2019, 2021, 2022 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018, 2019, 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
;;; Copyright © 2019, 2020, 2021 Marius Bakke <marius@gnu.org>
@ -3736,6 +3736,10 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%"
("libc:static" ,glibc-final "static")
("locales" ,glibc-utf8-locales-final))))
(define-public %final-inputs-riscv64
`(("gcc:lib" ,gcc-final "lib")
,@%final-inputs))
(define-public canonical-package
(let ((name->package (fold (lambda (input result)
(match input

4
guix/build-system/gnu.scm
View File

@ -273,7 +273,9 @@ standard packages used as implicit inputs of the GNU build system."
;; Resolve (gnu packages commencement) lazily to hide circular dependency.
(let ((distro (resolve-module '(gnu packages commencement))))
(module-ref distro '%final-inputs)))
(if (target-riscv64?)
(module-ref distro '%final-inputs-riscv64)
(module-ref distro '%final-inputs))))
(define* (lower name
#:key source inputs native-inputs outputs target