summaryrefslogtreecommitdiff
path: root/gotools
diff options
context:
space:
mode:
authorian <ian@138bc75d-0d04-0410-961f-82ee72b054a4>2015-03-12 16:44:36 +0000
committerian <ian@138bc75d-0d04-0410-961f-82ee72b054a4>2015-03-12 16:44:36 +0000
commit9176c71693f5d8945f7b38479f0b6b2a48d86baa (patch)
tree254bd5cbcbf7c140d6b5e53a1c4baf24d7feec07 /gotools
parente0fdeafaaeb99e0523e8b24e1ac3f16e9105e430 (diff)
downloadgcc-9176c71693f5d8945f7b38479f0b6b2a48d86baa.tar.gz
* Makefile.am (GOLINK): Add GOCFLAGS.
* Makefile.in: Rebuild. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@221397 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gotools')
-rw-r--r--gotools/ChangeLog5
-rw-r--r--gotools/Makefile.am2
-rw-r--r--gotools/Makefile.in4
3 files changed, 8 insertions, 3 deletions
diff --git a/gotools/ChangeLog b/gotools/ChangeLog
index f8ab65f4b4f..fbe4d74d500 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 a63346f0e63..9d3ca22346c 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 d56e224781f..c370157da47 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 \