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
This commit is contained in:
Ian Lance Taylor 2015-01-23 23:11:59 +00:00 committed by Ian Lance Taylor
parent d2c5e4c9c3
commit 0b855aa333
3 changed files with 9 additions and 3 deletions

View File

@ -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

View File

@ -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

View File

@ -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 \