branch core-updates updated: gnu: gcc: Patch gcc for riscv unconditionally.

[guix-commits]

This is an automated email from the git hooks/post-receive script.

efraim pushed a commit to branch core-updates
in repository guix.

The following commit(s) were added to refs/heads/core-updates by this push:
     new 7476a910a1 gnu: gcc: Patch gcc for riscv unconditionally.
7476a910a1 is described below

commit 7476a910a1c044583a2cb50037761c294761f1ad
Author: Efraim Flashner <efraim@flashner.co.il>
AuthorDate: Sun Jul 10 08:44:55 2022 +0300

    gnu: gcc: Patch gcc for riscv unconditionally.
    
    * gnu/packages/gcc.scm (gcc-4.7)[arguments]: In custom 'pre-configure
    phase unconditionally remove STARTFILE_PREFIX_SPEC in all locations it
    may exist.
---
 gnu/packages/gcc.scm | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm
index c5d21b50d9..75ee094531 100644
--- a/gnu/packages/gcc.scm
+++ b/gnu/packages/gcc.scm
@@ -295,15 +295,13 @@ where the OS part is overloaded to denote a specific 
ABI---into GCC
                     (substitute* "gcc/config/aarch64/t-aarch64-linux"
                       (("lib64") "lib")))
 
-                  ;; TODO: Make this unconditional in core-updates.
                   ;; The STARTFILE_PREFIX_SPEC prevents gcc from finding the
                   ;; gcc:lib output, which causes ld to not find -lgcc_s.
-                  ,@(if (target-riscv64?)
-                     `((when (file-exists? "gcc/config/riscv")
-                         (substitute* "gcc/config/riscv/linux.h"
-                           (("define STARTFILE_PREFIX_SPEC")
-                           "define __STARTFILE_PREFIX_SPEC"))))
-                     '())
+                  (when (file-exists? "gcc/config/riscv")
+                    (substitute* '("gcc/config/riscv/linux.h"
+                                   "gcc/config/riscv/riscv.h")  ; GCC < 10
+                      (("define STARTFILE_PREFIX_SPEC")
+                      "define __STARTFILE_PREFIX_SPEC")))
 
                   (when (file-exists? "libbacktrace")
                     ;; GCC 4.8+ comes with libbacktrace.  By default it builds