summaryrefslogtreecommitdiff
path: root/gotools
diff options
context:
space:
mode:
authorian <ian@138bc75d-0d04-0410-961f-82ee72b054a4>2015-01-23 23:11:59 +0000
committerian <ian@138bc75d-0d04-0410-961f-82ee72b054a4>2015-01-23 23:11:59 +0000
commitbb11842d3ad5339d4ef1decf0e1cdd9d98c7b1a5 (patch)
tree027884e696ccb41d2fc72d1e89deb5203cddf0ab /gotools
parent5cd82172f59fdf92d81f34161c1d46f3d90f48d4 (diff)
downloadgcc-bb11842d3ad5339d4ef1decf0e1cdd9d98c7b1a5.tar.gz
PR go/64738
* Makefile.am (AM_LDFLAGS): Remove -static-libgo. * Makefile.in: Rebuild. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@220066 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gotools')
-rw-r--r--gotools/ChangeLog6
-rw-r--r--gotools/Makefile.am2
-rw-r--r--gotools/Makefile.in4
3 files changed, 9 insertions, 3 deletions
diff --git a/gotools/ChangeLog b/gotools/ChangeLog
index aad9561680a..f8ab65f4b4f 100644
--- a/gotools/ChangeLog
+++ b/gotools/ChangeLog
@@ -1,3 +1,9 @@
+2015-01-23 Ian Lance Taylor <iant@google.com>
+
+ PR go/64738
+ * Makefile.am (AM_LDFLAGS): Remove -static-libgo.
+ * Makefile.in: Rebuild.
+
2015-01-22 Ian Lance Taylor <iant@google.com>
PR go/64595
diff --git a/gotools/Makefile.am b/gotools/Makefile.am
index 8bee836a036..a63346f0e63 100644
--- a/gotools/Makefile.am
+++ b/gotools/Makefile.am
@@ -38,7 +38,7 @@ endif
GOCFLAGS = $(CFLAGS_FOR_TARGET)
GOCOMPILE = $(GOCOMPILER) $(GOCFLAGS)
-AM_LDFLAGS = -L $(libgodir) -L $(libgodir)/.libs -static-libgo
+AM_LDFLAGS = -L $(libgodir) -L $(libgodir)/.libs
GOLINK = $(GOCOMPILER) $(AM_GOCFLAGS) $(LDFLAGS) $(AM_LDFLAGS) -o $@
cmdsrcdir = $(srcdir)/../libgo/go/cmd
diff --git a/gotools/Makefile.in b/gotools/Makefile.in
index e37d131c1d2..d56e224781f 100644
--- a/gotools/Makefile.in
+++ b/gotools/Makefile.in
@@ -230,7 +230,7 @@ LIBGODEP = $(libgodir)/libgo.la
# Use the compiler we just built.
@NATIVE_TRUE@GOCOMPILER = $(GOC_FOR_TARGET)
GOCOMPILE = $(GOCOMPILER) $(GOCFLAGS)
-AM_LDFLAGS = -L $(libgodir) -L $(libgodir)/.libs -static-libgo
+AM_LDFLAGS = -L $(libgodir) -L $(libgodir)/.libs
GOLINK = $(GOCOMPILER) $(AM_GOCFLAGS) $(LDFLAGS) $(AM_LDFLAGS) -o $@
cmdsrcdir = $(srcdir)/../libgo/go/cmd
go_cmd_go_files = \
@@ -518,8 +518,8 @@ distclean-generic:
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@echo "it deletes files that may require special tools to rebuild."
-@NATIVE_FALSE@install-exec-local:
@NATIVE_FALSE@uninstall-local:
+@NATIVE_FALSE@install-exec-local:
clean: clean-am
clean-am: clean-binPROGRAMS clean-generic clean-noinstPROGRAMS \