From: Ian Lance Taylor <iant@golang.org>
Date: Mon, 26 Jun 2017 22:47:18 +0000 (+0000)
Subject: Makefile.am (s-zdefaultcc): Don't record $(bindir) for defaultCC or defaultCXX.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=8e51be6272dadab6e02f258fec48f05a1fa03458;p=gcc.git

Makefile.am (s-zdefaultcc): Don't record $(bindir) for defaultCC or defaultCXX.

	* Makefile.am (s-zdefaultcc): Don't record $(bindir) for defaultCC
	or defaultCXX.
	* Makefile.in: Rebuild.

From-SVN: r249669
---

diff --git a/gotools/ChangeLog b/gotools/ChangeLog
index 9fbc221bb90..1efa2235a84 100644
--- a/gotools/ChangeLog
+++ b/gotools/ChangeLog
@@ -1,3 +1,9 @@
+2017-06-26  Ian Lance Taylor  <iant@golang.org>
+
+	* Makefile.am (s-zdefaultcc): Don't record $(bindir) for defaultCC
+	or defaultCXX.
+	* Makefile.in: Rebuild.
+
 2017-06-16  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
 
 	* Makefile.am (check-go-tool): Don't use >& for I/O redirection.
diff --git a/gotools/Makefile.am b/gotools/Makefile.am
index 010c5bb554b..17d197908de 100644
--- a/gotools/Makefile.am
+++ b/gotools/Makefile.am
@@ -100,8 +100,8 @@ zdefaultcc.go: s-zdefaultcc; @true
 s-zdefaultcc: Makefile
 	echo 'package main' > zdefaultcc.go.tmp
 	echo 'const defaultGCCGO = "$(bindir)/$(GCCGO_INSTALL_NAME)"' >> zdefaultcc.go.tmp
-	echo 'const defaultCC = "$(bindir)/$(GCC_INSTALL_NAME)"' >> zdefaultcc.go.tmp
-	echo 'const defaultCXX = "$(bindir)/$(GXX_INSTALL_NAME)"' >> zdefaultcc.go.tmp
+	echo 'const defaultCC = "$(GCC_INSTALL_NAME)"' >> zdefaultcc.go.tmp
+	echo 'const defaultCXX = "$(GXX_INSTALL_NAME)"' >> zdefaultcc.go.tmp
 	echo 'const defaultPkgConfig = "pkg-config"' >> zdefaultcc.go.tmp
 	$(SHELL) $(srcdir)/../move-if-change zdefaultcc.go.tmp zdefaultcc.go
 	$(STAMP) $@ 
diff --git a/gotools/Makefile.in b/gotools/Makefile.in
index b57d89a9230..cbd8c916b68 100644
--- a/gotools/Makefile.in
+++ b/gotools/Makefile.in
@@ -582,8 +582,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 \
@@ -682,8 +682,8 @@ zdefaultcc.go: s-zdefaultcc; @true
 s-zdefaultcc: Makefile
 	echo 'package main' > zdefaultcc.go.tmp
 	echo 'const defaultGCCGO = "$(bindir)/$(GCCGO_INSTALL_NAME)"' >> zdefaultcc.go.tmp
-	echo 'const defaultCC = "$(bindir)/$(GCC_INSTALL_NAME)"' >> zdefaultcc.go.tmp
-	echo 'const defaultCXX = "$(bindir)/$(GXX_INSTALL_NAME)"' >> zdefaultcc.go.tmp
+	echo 'const defaultCC = "$(GCC_INSTALL_NAME)"' >> zdefaultcc.go.tmp
+	echo 'const defaultCXX = "$(GXX_INSTALL_NAME)"' >> zdefaultcc.go.tmp
 	echo 'const defaultPkgConfig = "pkg-config"' >> zdefaultcc.go.tmp
 	$(SHELL) $(srcdir)/../move-if-change zdefaultcc.go.tmp zdefaultcc.go
 	$(STAMP) $@