222/290: gnu: gcc-4.7: Fix slash in startfile prefix.

[guix-commits]

janneke pushed a commit to branch core-packages-team
in repository guix.

commit c25f0398eab0dee65fffc8ce9237ff3bafcc173e
Author: Leo Nikkilä <he...@lnikki.la>
AuthorDate: Sat Jan 11 03:43:57 2025 +0200

    gnu: gcc-4.7: Fix slash in startfile prefix.
    
    These prefixes must have a trailing slash.  When this slash is
    omitted, gcc fails to find ?crt*.o files when LIBRARY_PATH is not set.
    
    Fixes #75483, see <https://issues.guix.gnu.org/75483>.
    
    * gnu/packages/gcc.scm (gcc-4.7): Fix replaced startfile prefix.
    [arguments]: <#:phases>: Fix it.
    
    Change-Id: I1988e0bf98b0002e83e0c0233310d05b72644ac9
    Signed-off-by: Ludovic Courtès <l...@gnu.org>
---
 gnu/packages/gcc.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm
index 40fe0eec93..efeee13349 100644
--- a/gnu/packages/gcc.scm
+++ b/gnu/packages/gcc.scm
@@ -313,7 +313,7 @@ exec \"$@\" \
 \"-L~a/lib %{!static:-rpath=~a/lib %{!static-libgcc:-rpath=~a/lib -lgcc_s}} \" 
~a"
                                libc libc libdir suffix))
                       (("#define GNU_USER_TARGET_STARTFILE_SPEC.*$" line)
-                       (format #f "#define STANDARD_STARTFILE_PREFIX_1 
\"~a/lib\"
+                       (format #f "#define STANDARD_STARTFILE_PREFIX_1 
\"~a/lib/\"
 #define STANDARD_STARTFILE_PREFIX_2 \"\"
 ~a"
                                libc line)))
@@ -327,7 +327,7 @@ exec \"$@\" \
 \"-L~a/lib %{!static:-rpath=~a/lib %{!static-libgcc:-rpath=~a/lib -lgcc_s}} \" 
~a"
                                libc libc libdir suffix))
                       (("#define       STARTFILE_LINUX_SPEC.*$" line)
-                       (format #f "#define STANDARD_STARTFILE_PREFIX_1 
\"~a/lib\"
+                       (format #f "#define STANDARD_STARTFILE_PREFIX_1 
\"~a/lib/\"
 #define STANDARD_STARTFILE_PREFIX_2 \"\"
 ~a"
                                libc line))))