diff options
| author | Efraim Flashner <efraim@flashner.co.il> | 2022-01-24 17:13:11 +0200 |
|---|---|---|
| committer | Efraim Flashner <efraim@flashner.co.il> | 2022-01-27 09:36:36 +0200 |
| commit | 0444be868903356a37fc8ffd3cdf820ca038f3e6 (patch) | |
| tree | b49a7115eaa0a49148e761961c8715a7e3ff80ab | |
| parent | 90a41fe388102d448b3f91a070e38a7680d2d568 (diff) | |
| download | guix-0444be868903356a37fc8ffd3cdf820ca038f3e6.tar guix-0444be868903356a37fc8ffd3cdf820ca038f3e6.tar.gz | |
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.
| -rw-r--r-- | gnu/packages/commencement.scm | 6 | ||||
| -rw-r--r-- | guix/build-system/gnu.scm | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 26769d2626..96d914344d 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -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 diff --git a/guix/build-system/gnu.scm b/guix/build-system/gnu.scm index 651415098e..2f74000eef 100644 --- a/guix/build-system/gnu.scm +++ b/guix/build-system/gnu.scm @@ -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 |