guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

05/05: gnu: go-1.14: Fix test failure with GCC 9+.


From: guix-commits
Subject: 05/05: gnu: go-1.14: Fix test failure with GCC 9+.
Date: Sun, 8 Aug 2021 08:15:43 -0400 (EDT)

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

commit 2818c66e93c4803de1d9fb8fbc11ccc9fa6a1859
Author: Sarah Morgensen <iskarian@mgsn.dev>
AuthorDate: Fri Aug 6 14:40:17 2021 -0700

    gnu: go-1.14: Fix test failure with GCC 9+.
    
    With GCC 9+, go-1.14 fails a test when the gold linker is not
    available (https://github.com/golang/go/issues/39157). Backport the fix
    for that from https://github.com/golang/go/commit/4ec4a79.
    
    * gnu/packages/golang.scm (go-1.14)[arguments]<#:phases>{prebuild}:
    Fix test failure with GCC 9+.
    
    Signed-off-by: Efraim Flashner <efraim@flashner.co.il>
---
 gnu/packages/golang.scm | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 590854d..ec58c4d 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -1248,6 +1248,11 @@ in the style of communicating sequential processes 
(@dfn{CSP}).")
                    (("/bin/pwd") (which "pwd"))
                    (("/bin/sh") (which "sh")))
 
+                 ;; Backport fix for go-1.14 with GCC 9+
+                 ;; https://github.com/golang/go/issues/39157
+                 (substitute* "cmd/go/note_test.go"
+                   (("cannot find 'ld'") "cannot find [‘']ld[’']"))
+
                  ;; Add libgcc to runpath
                  (substitute* "cmd/link/internal/ld/lib.go"
                    (("!rpath.set") "true"))



reply via email to

[Prev in Thread] Current Thread [Next in Thread]