From 0b855aa333910c543eeb95a9cd91226a3731a83e Mon Sep 17 00:00:00 2001 From: Ian Lance Taylor Date: Fri, 23 Jan 2015 23:11:59 +0000 Subject: [PATCH] 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 --- gotools/ChangeLog | 6 ++++++ gotools/Makefile.am | 2 +- gotools/Makefile.in | 4 ++-- 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 + + PR go/64738 + * Makefile.am (AM_LDFLAGS): Remove -static-libgo. + * Makefile.in: Rebuild. + 2015-01-22 Ian Lance Taylor 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 \ -- 2.30.2