aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorIan Lance Taylor <ian@gcc.gnu.org>2017-09-20 23:31:00 +0000
committerIan Lance Taylor <ian@gcc.gnu.org>2017-09-20 23:31:00 +0000
commit7399e345be175f47d0a7287703c752a2941fa889 (patch)
treed215d05316d47d51edd70abb6400cb803f1591bf /gcc
parent073809a7187bba6eb3a775d45a248754e9f37a64 (diff)
downloadgcc-7399e345be175f47d0a7287703c752a2941fa889.zip
gcc-7399e345be175f47d0a7287703c752a2941fa889.tar.gz
gcc-7399e345be175f47d0a7287703c752a2941fa889.tar.bz2
libgo: fix build when using -enable-static=no
With -enable-static=no we don't build non-pic objects, but libgotool.a is built from non-pic objects. Build the packages that go into libgotool.a in static mode in all cases. Also ensure that internal test packages are built, since nothing explicitly depended on them. Reviewed-on: https://go-review.googlesource.com/65050 From-SVN: r253042
Diffstat (limited to 'gcc')
-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 06f8d62..5b3206a 100644
--- a/gcc/go/gofrontend/MERGE
+++ b/gcc/go/gofrontend/MERGE
@@ -1,4 +1,4 @@
-5deeab42b0e5fdf2721773ce7fdaf61716599d4d
+1fcb9bb3cefb97cfab1e623826a1cc3f6aadd5f7
The first line of this file holds the git revision number of the last
merge done from the gofrontend repository.