diff options
| author | ian <ian@138bc75d-0d04-0410-961f-82ee72b054a4> | 2017-06-26 22:47:18 +0000 |
|---|---|---|
| committer | ian <ian@138bc75d-0d04-0410-961f-82ee72b054a4> | 2017-06-26 22:47:18 +0000 |
| commit | a7c47f467e9ecc99371369243fdfb7bb97dc0e62 (patch) | |
| tree | b9a9674b4e77ce4e5e9c5a20209505a309906413 /gotools | |
| parent | bfd82f35fea036a7229257c77fa5a225dcc2d951 (diff) | |
| download | gcc-a7c47f467e9ecc99371369243fdfb7bb97dc0e62.tar.gz | |
* Makefile.am (s-zdefaultcc): Don't record $(bindir) for defaultCC
or defaultCXX.
* Makefile.in: Rebuild.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@249669 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gotools')
| -rw-r--r-- | gotools/ChangeLog | 6 | ||||
| -rw-r--r-- | gotools/Makefile.am | 4 | ||||
| -rw-r--r-- | gotools/Makefile.in | 6 |
3 files changed, 11 insertions, 5 deletions
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) $@ |