Makefile.am (GOLINK): Add GOCFLAGS.

	* Makefile.am (GOLINK): Add GOCFLAGS.
	* Makefile.in: Rebuild.

From-SVN: r221397

gotools/ChangeLog

+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

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
 

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 \