From fafa095c5f96bc88fca695f0ecc03898a08a8c48 Mon Sep 17 00:00:00 2001 From: Ian Lance Taylor <iant@google.com> Date: Thu, 12 Mar 2015 16:44:36 +0000 Subject: [PATCH] Makefile.am (GOLINK): Add GOCFLAGS. * Makefile.am (GOLINK): Add GOCFLAGS. * Makefile.in: Rebuild. From-SVN: r221397 --- gotools/ChangeLog | 5 +++++ gotools/Makefile.am | 2 +- gotools/Makefile.in | 4 ++-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/gotools/ChangeLog b/gotools/ChangeLog index f8ab65f4b4f0..fbe4d74d5006 100644 --- a/gotools/ChangeLog +++ b/gotools/ChangeLog @@ -1,3 +1,8 @@ +2015-03-12 Ian Lance Taylor <iant@google.com> + + * Makefile.am (GOLINK): Add GOCFLAGS. + * Makefile.in: Rebuild. + 2015-01-23 Ian Lance Taylor <iant@google.com> PR go/64738 diff --git a/gotools/Makefile.am b/gotools/Makefile.am index a63346f0e63b..9d3ca22346c7 100644 --- a/gotools/Makefile.am +++ b/gotools/Makefile.am @@ -39,7 +39,7 @@ GOCFLAGS = $(CFLAGS_FOR_TARGET) GOCOMPILE = $(GOCOMPILER) $(GOCFLAGS) AM_LDFLAGS = -L $(libgodir) -L $(libgodir)/.libs -GOLINK = $(GOCOMPILER) $(AM_GOCFLAGS) $(LDFLAGS) $(AM_LDFLAGS) -o $@ +GOLINK = $(GOCOMPILER) $(GOCFLAGS) $(AM_GOCFLAGS) $(LDFLAGS) $(AM_LDFLAGS) -o $@ cmdsrcdir = $(srcdir)/../libgo/go/cmd diff --git a/gotools/Makefile.in b/gotools/Makefile.in index d56e224781f3..c370157da477 100644 --- a/gotools/Makefile.in +++ b/gotools/Makefile.in @@ -231,7 +231,7 @@ LIBGODEP = $(libgodir)/libgo.la @NATIVE_TRUE@GOCOMPILER = $(GOC_FOR_TARGET) GOCOMPILE = $(GOCOMPILER) $(GOCFLAGS) AM_LDFLAGS = -L $(libgodir) -L $(libgodir)/.libs -GOLINK = $(GOCOMPILER) $(AM_GOCFLAGS) $(LDFLAGS) $(AM_LDFLAGS) -o $@ +GOLINK = $(GOCOMPILER) $(GOCFLAGS) $(AM_GOCFLAGS) $(LDFLAGS) $(AM_LDFLAGS) -o $@ cmdsrcdir = $(srcdir)/../libgo/go/cmd go_cmd_go_files = \ $(cmdsrcdir)/go/build.go \ @@ -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@uninstall-local: @NATIVE_FALSE@install-exec-local: +@NATIVE_FALSE@uninstall-local: clean: clean-am clean-am: clean-binPROGRAMS clean-generic clean-noinstPROGRAMS \ -- GitLab