From 74bc8e59df6e54bf325ac5e5902106f82a282ae8 Mon Sep 17 00:00:00 2001 From: Sarah Morgensen Date: Sat, 14 Aug 2021 15:47:36 -0400 Subject: 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. This is a followup to the 'master -> core-updates-frozen' merge in c4133c43c7cfe2476ebfae87f9e4d10d96de9bc7, which accidentally dropped this commit (2818c66e93c4803de1d9fb8fbc11ccc9fa6a1859) due to the code in question being moved to another part of the file on the master branch. Reported on #guix by iskarian: * gnu/packages/golang.scm (go-1.14)[arguments]<#:phases>{prebuild}: Fix test failure with GCC 9+. Signed-off-by: Leo Famulari --- gnu/packages/golang.scm | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'gnu/packages/golang.scm') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index c4122f961e..028a666963 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -307,6 +307,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")) -- cgit v1.2.3