summaryrefslogtreecommitdiff
path: root/lang
diff options
context:
space:
mode:
authorjoerg <joerg@pkgsrc.org>2014-06-14 16:22:25 +0000
committerjoerg <joerg@pkgsrc.org>2014-06-14 16:22:25 +0000
commit71d67d1f3702803324f4918174404f1902211089 (patch)
treecad1c9ac4ed03362af31b43e728f6122109c2ee0 /lang
parent72901c7bf4f2c41db26f543b83cbe03b06d82518 (diff)
downloadpkgsrc-71d67d1f3702803324f4918174404f1902211089.tar.gz
If libgcc.a doesn't exist, don't fail.
Diffstat (limited to 'lang')
-rw-r--r--lang/go/distinfo3
-rw-r--r--lang/go/patches/patch-src_cmd_go_build.go16
2 files changed, 18 insertions, 1 deletions
diff --git a/lang/go/distinfo b/lang/go/distinfo
index 740407c55c5..751f92c7aa0 100644
--- a/lang/go/distinfo
+++ b/lang/go/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.8 2014/05/27 18:56:53 bsiegert Exp $
+$NetBSD: distinfo,v 1.9 2014/06/14 16:22:25 joerg Exp $
SHA1 (go1.2.2.src.tar.gz) = 3ce0ac4db434fc1546fec074841ff40dc48c1167
RMD160 (go1.2.2.src.tar.gz) = 06674def74b0a579d87ec983e350a7169e5c7ddf
Size (go1.2.2.src.tar.gz) = 9520571 bytes
+SHA1 (patch-src_cmd_go_build.go) = e8bdd5ad005feeb806a6cec024a9b6553234757c
SHA1 (patch-src_cmd_ld_elf.c) = fd65c28a0191d06b2cab3c33a12276393d615bc8
diff --git a/lang/go/patches/patch-src_cmd_go_build.go b/lang/go/patches/patch-src_cmd_go_build.go
new file mode 100644
index 00000000000..9c60227b216
--- /dev/null
+++ b/lang/go/patches/patch-src_cmd_go_build.go
@@ -0,0 +1,16 @@
+$NetBSD: patch-src_cmd_go_build.go,v 1.1 2014/06/14 16:22:25 joerg Exp $
+
+libgcc might simply not exist at all, so just ignore it if it is not
+an absolute path.
+
+--- src/cmd/go/build.go.orig 2014-05-30 11:43:55.000000000 +0000
++++ src/cmd/go/build.go
+@@ -1809,7 +1809,7 @@ func (b *builder) libgcc(p *Package) (st
+
+ // clang might not be able to find libgcc, and in that case,
+ // it will simply return "libgcc.a", which is of no use to us.
+- if strings.Contains(gccCmd[0], "clang") && !filepath.IsAbs(string(f)) {
++ if !filepath.IsAbs(string(f)) {
+ return "", nil
+ }
+