From 030900747b27643c73400a806ebabc00d9a943ff Mon Sep 17 00:00:00 2001
From: Efraim Flashner <efraim@flashner.co.il>
Date: Wed, 16 Mar 2022 12:16:15 +0200
Subject: Revert "gnu: Add %final-inputs-riscv64."

This reverts commit 0444be868903356a37fc8ffd3cdf820ca038f3e6.

This is no longer necessary after the gcc STARTFILE_PREFIX_SPEC commit.
---
 gnu/packages/commencement.scm | 13 -------------
 guix/build-system/gnu.scm     |  4 +---
 2 files changed, 1 insertion(+), 16 deletions(-)

diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index 9b495d8d84..efd840d67c 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -3737,19 +3737,6 @@ 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
-  ;; This is similar to the added (list gcc "lib") elsewhere in this file, but
-  ;; due to how (%current-system) is re-defined when performing builds with the
-  ;; 'gnu.system' flag, %final-inputs is too early in the evaulation pipeline to
-  ;; correctly identify the system for which a derivation will be built. Thus,
-  ;; since (%current-system) is re-determined by (guix build-system gnu) after
-  ;; loading %final-inputs but before taking into account the 'gnu.system' flag,
-  ;; the test for (target-riscv64?) needs to be in (guix build-system gnu),
-  ;; with %final-inputs-riscv64 already available at the same time that
-  ;; %final-inputs is available.
-  `(("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 2f74000eef..651415098e 100644
--- a/guix/build-system/gnu.scm
+++ b/guix/build-system/gnu.scm
@@ -273,9 +273,7 @@ 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))))
-    (if (target-riscv64?)
-      (module-ref distro '%final-inputs-riscv64)
-      (module-ref distro '%final-inputs))))
+    (module-ref distro '%final-inputs)))
 
 (define* (lower name
                 #:key source inputs native-inputs outputs target
-- 
cgit v1.2.3