Commit 0b855aa3 by Ian Lance Taylor Committed by Ian Lance Taylor

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
parent d2c5e4c9
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> 2015-01-22 Ian Lance Taylor <iant@google.com>
PR go/64595 PR go/64595
......
...@@ -38,7 +38,7 @@ endif ...@@ -38,7 +38,7 @@ endif
GOCFLAGS = $(CFLAGS_FOR_TARGET) GOCFLAGS = $(CFLAGS_FOR_TARGET)
GOCOMPILE = $(GOCOMPILER) $(GOCFLAGS) 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 $@ GOLINK = $(GOCOMPILER) $(AM_GOCFLAGS) $(LDFLAGS) $(AM_LDFLAGS) -o $@
cmdsrcdir = $(srcdir)/../libgo/go/cmd cmdsrcdir = $(srcdir)/../libgo/go/cmd
......
...@@ -230,7 +230,7 @@ LIBGODEP = $(libgodir)/libgo.la ...@@ -230,7 +230,7 @@ LIBGODEP = $(libgodir)/libgo.la
# Use the compiler we just built. # Use the compiler we just built.
@NATIVE_TRUE@GOCOMPILER = $(GOC_FOR_TARGET) @NATIVE_TRUE@GOCOMPILER = $(GOC_FOR_TARGET)
GOCOMPILE = $(GOCOMPILER) $(GOCFLAGS) 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 $@ GOLINK = $(GOCOMPILER) $(AM_GOCFLAGS) $(LDFLAGS) $(AM_LDFLAGS) -o $@
cmdsrcdir = $(srcdir)/../libgo/go/cmd cmdsrcdir = $(srcdir)/../libgo/go/cmd
go_cmd_go_files = \ go_cmd_go_files = \
...@@ -518,8 +518,8 @@ distclean-generic: ...@@ -518,8 +518,8 @@ distclean-generic:
maintainer-clean-generic: maintainer-clean-generic:
@echo "This command is intended for maintainers to use" @echo "This command is intended for maintainers to use"
@echo "it deletes files that may require special tools to rebuild." @echo "it deletes files that may require special tools to rebuild."
@NATIVE_FALSE@install-exec-local:
@NATIVE_FALSE@uninstall-local: @NATIVE_FALSE@uninstall-local:
@NATIVE_FALSE@install-exec-local:
clean: clean-am clean: clean-am
clean-am: clean-binPROGRAMS clean-generic clean-noinstPROGRAMS \ clean-am: clean-binPROGRAMS clean-generic clean-noinstPROGRAMS \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment