summary refs log tree commit diff
diff options
context:
space:
mode:
authorSarah Morgensen <iskarian@mgsn.dev>2021-08-06 14:40:17 -0700
committerEfraim Flashner <efraim@flashner.co.il>2021-08-08 15:13:44 +0300
commit2818c66e93c4803de1d9fb8fbc11ccc9fa6a1859 (patch)
tree6824c6b65100cdd9ef2da95de52e9c41ff9b7186
parent0e66a66864bffdf618e13da8ce825a72154d16d7 (diff)
downloadguix-2818c66e93c4803de1d9fb8fbc11ccc9fa6a1859.tar.gz
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>
-rw-r--r--gnu/packages/golang.scm5
1 files changed, 5 insertions, 0 deletions
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 590854d74e..ec58c4d984 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"))