Makefile.am (GOCOMPILER): Set to GOC or GOC_FOR_TARGET depending on whether this...

	* Makefile.am (GOCOMPILER): Set to GOC or GOC_FOR_TARGET depending
	on whether this is a native build or not.
	(GOCOMPILE, GOLINK): Use $(GOCOMPILER) instead of $(GOC).
	(MOSTLYCLEANFILES): Define.
	* Makefile.in: Rebuild.

From-SVN: r219418

diff --git a/gotools/ChangeLog b/gotools/ChangeLog
index 12bfb591087c6fbcdd63b3e06bb147b1e8b7c507..0e24b33d75a009a9f9058016686ae7de892c6ecb 100644 (file)
--- a/gotools/ChangeLog
+++ b/gotools/ChangeLog
@@ -1,3 +1,9 @@
 2015-01-09  Ian Lance Taylor  <iant@google.com>
 
+       * Makefile.am (GOCOMPILER): Set to GOC or GOC_FOR_TARGET depending
+       on whether this is a native build or not.
+       (GOCOMPILE, GOLINK): Use $(GOCOMPILER) instead of $(GOC).
+       (MOSTLYCLEANFILES): Define.
+       * Makefile.in: Rebuild.
+
        * Initial implementation.

diff --git a/gotools/Makefile.am b/gotools/Makefile.am
index 248bed4b82c01f66dda741416751350fb7d9d37c..8a564ff3fa38ee9d1492e3c6090c59eccafa3b9c 100644 (file)
--- a/gotools/Makefile.am
+++ b/gotools/Makefile.am
@@ -28,11 +28,18 @@ STAMP = echo timestamp >
 libgodir = ../$(target_noncanonical)/libgo
 LIBGODEP = $(libgodir)/libgo.la
 
+if NATIVE
+# Use the compiler we just built.
+GOCOMPILER = $(GOC_FOR_TARGET)
+else
+GOCOMPILER = $(GOC)
+endif
+
 GOCFLAGS = $(CFLAGS_FOR_TARGET)
-GOCOMPILE = $(GOC) $(GOCFLAGS)
+GOCOMPILE = $(GOCOMPILER) $(GOCFLAGS)
 
 AM_LDFLAGS = -L $(libgodir) -L $(libgodir)/.libs -static-libgo
-GOLINK = $(GOC) $(AM_GOCFLAGS) $(LDFLAGS) $(AM_LDFLAGS) -o $@
+GOLINK = $(GOCOMPILER) $(AM_GOCFLAGS) $(LDFLAGS) $(AM_LDFLAGS) -o $@
 
 cmdsrcdir = $(srcdir)/../libgo/go/cmd
 
@@ -89,6 +96,8 @@ s-zdefaultcc: Makefile
        $(SHELL) $(srcdir)/../move-if-change zdefaultcc.go.tmp zdefaultcc.go
        $(STAMP) $@ 
 
+MOSTLYCLEANFILES = zdefaultcc.go s-zdefaultcc
+
 if NATIVE
 
 # For a native build we build the programs using the newly built libgo

diff --git a/gotools/Makefile.in b/gotools/Makefile.in
index bbe5b834f42ccac5be7a35d7019c71cad8a09e3d..b108d9d916cc08e544e398e45c594140b8c76f21 100644 (file)
--- a/gotools/Makefile.in
+++ b/gotools/Makefile.in
@@ -53,9 +53,10 @@ build_triplet = @build@
 host_triplet = @host@
 target_triplet = @target@
 subdir = .
-DIST_COMMON = README $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
-       $(top_srcdir)/configure $(am__configure_deps) \
-       $(srcdir)/../mkinstalldirs $(srcdir)/../depcomp
+DIST_COMMON = README ChangeLog $(srcdir)/Makefile.in \
+       $(srcdir)/Makefile.am $(top_srcdir)/configure \
+       $(am__configure_deps) $(srcdir)/../mkinstalldirs \
+       $(srcdir)/../depcomp
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../config/acx.m4 \
        $(top_srcdir)/../config/depstand.m4 \
@@ -199,9 +200,13 @@ PWD_COMMAND = $${PWDCMD-pwd}
 STAMP = echo timestamp >
 libgodir = ../$(target_noncanonical)/libgo
 LIBGODEP = $(libgodir)/libgo.la
-GOCOMPILE = $(GOC) $(GOCFLAGS)
+@NATIVE_FALSE@GOCOMPILER = $(GOC)
+
+# Use the compiler we just built.
+@NATIVE_TRUE@GOCOMPILER = $(GOC_FOR_TARGET)
+GOCOMPILE = $(GOCOMPILER) $(GOCFLAGS)
 AM_LDFLAGS = -L $(libgodir) -L $(libgodir)/.libs -static-libgo
-GOLINK = $(GOC) $(AM_GOCFLAGS) $(LDFLAGS) $(AM_LDFLAGS) -o $@
+GOLINK = $(GOCOMPILER) $(AM_GOCFLAGS) $(LDFLAGS) $(AM_LDFLAGS) -o $@
 cmdsrcdir = $(srcdir)/../libgo/go/cmd
 go_cmd_go_files = \
        $(cmdsrcdir)/go/build.go \
@@ -246,6 +251,7 @@ go_cmd_cgo_files = \
 GCCGO_INSTALL_NAME := $(shell echo gccgo|sed '$(program_transform_name)')
 GCC_INSTALL_NAME := $(shell echo gcc|sed '$(program_transform_name)')
 GXX_INSTALL_NAME := $(shell echo g++|sed '$(program_transform_name)')
+MOSTLYCLEANFILES = zdefaultcc.go s-zdefaultcc
 
 # For a native build we build the programs using the newly built libgo
 # and install them as regular programs.
@@ -470,6 +476,7 @@ install-strip:
          `test -z '$(STRIP)' || \
            echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 mostlyclean-generic:
+       -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
 
 clean-generic: