summaryrefslogtreecommitdiff
path: root/gcc/go
diff options
context:
space:
mode:
authorIan Lance Taylor <ian@gcc.gnu.org>2017-11-21 06:19:10 +0000
committerIan Lance Taylor <ian@gcc.gnu.org>2017-11-21 06:19:10 +0000
commitc9548fa4f1c1eaee8d5760632d2f47c649f25238 (patch)
treeebbdafbaed8438eccfc128024fa0f2afb065c26c /gcc/go
parent5e43a9eeca114f99248c46495449d6fd4fc2b63e (diff)
downloadgcc-c9548fa4f1c1eaee8d5760632d2f47c649f25238.tar.gz
libgo: fix makefile buglet
Fix a small bug in the libgo Makefile recipe that constructs the directory from which to pick up libgcc_s.so ; the gccgo invocation with -print-libgcc-file-name was missing the flags, which meant that for -m32 builds we'd see the 64-bit libgcc dir. Reviewed-on: https://go-review.googlesource.com/78836 From-SVN: r254984
Diffstat (limited to 'gcc/go')
-rw-r--r--gcc/go/gofrontend/MERGE2
1 files changed, 1 insertions, 1 deletions
diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE
index ed351c032ed..01d8515d1de 100644
--- a/gcc/go/gofrontend/MERGE
+++ b/gcc/go/gofrontend/MERGE
@@ -1,4 +1,4 @@
-5485b3faed476f6d051833d1790b5f77be9d1efc
+fecb92bda0aa6d70c89d14635ff568df77d2bb5f
The first line of this file holds the git revision number of the last
merge done from the gofrontend repository.