re PR go/64738 (go, gofmt and cgo binaries linked statically)

	PR go/64738
	* Makefile.am (AM_LDFLAGS): Remove -static-libgo.
	* Makefile.in: Rebuild.

From-SVN: r220066

diff --git a/gotools/ChangeLog b/gotools/ChangeLog
index aad9561680a84c25e67d30973e62d5cb8bb2600d..f8ab65f4b4f0840fc2a083f989747c584343a40c 100644 (file)
--- 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 8bee836a0360fe1f72e03a2c3797893793ced2c5..a63346f0e63bec9816d8f9941aec7732b93722f5 100644 (file)
--- 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 e37d131c1d242574d164b0ff66a0c7ec639caa0d..d56e224781f3910efda5ad10d965b2d6b9ec16c6 100644 (file)
--- 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 \