diff options
| author | Ian Lance Taylor <iant@golang.org> | 2019-02-13 00:10:06 +0000 |
|---|---|---|
| committer | Ian Lance Taylor <ian@gcc.gnu.org> | 2019-02-13 00:10:06 +0000 |
| commit | 7ca1909caa2d7ba833b4ecb424cf5b50180f42d5 (patch) | |
| tree | fbdf43d7ad66f50a6f19625775b1798e20a7a6fb /gotools | |
| parent | ced20a50bc3c34dc36d602f024123433bf009f5d (diff) | |
re PR go/89193 ("make distclean" leaves stuff in gotools/)
PR go/89193
* Makefile.am (mostlyclean-local): Avoid getting an error from
chmod. Remove check-vet-dir and gocache-test.
* Makefile.in: Regenerate.
From-SVN: r268830
Diffstat (limited to 'gotools')
| -rw-r--r-- | gotools/ChangeLog | 7 | ||||
| -rw-r--r-- | gotools/Makefile.am | 5 | ||||
| -rw-r--r-- | gotools/Makefile.in | 7 |
3 files changed, 14 insertions, 5 deletions
diff --git a/gotools/ChangeLog b/gotools/ChangeLog index 7404c209e50..22ecd9a4083 100644 --- a/gotools/ChangeLog +++ b/gotools/ChangeLog @@ -1,3 +1,10 @@ +2019-02-12 Ian Lance Taylor <iant@golang.org> + + PR go/89193 + * Makefile.am (mostlyclean-local): Avoid getting an error from + chmod. Remove check-vet-dir and gocache-test. + * Makefile.in: Regenerate. + 2019-01-28 Uroš Bizjak <ubizjak@gmail.com> * Makefile.in: Really regenerate. diff --git a/gotools/Makefile.am b/gotools/Makefile.am index ad0ad24e206..2ade1d7f019 100644 --- a/gotools/Makefile.am +++ b/gotools/Makefile.am @@ -100,8 +100,9 @@ MOSTLYCLEANFILES = \ *.sent mostlyclean-local: - -chmod -R u+w check-go-dir - rm -rf check-go-dir check-runtime-dir cgo-test-dir carchive-test-dir + if test -d check-go-dir; then chmod -R u+w check-go-dir; fi + rm -rf check-go-dir check-runtime-dir cgo-test-dir carchive-test-dir \ + check-vet-dir gocache-test if NATIVE diff --git a/gotools/Makefile.in b/gotools/Makefile.in index 8bea35500bd..c591b709581 100644 --- a/gotools/Makefile.in +++ b/gotools/Makefile.in @@ -703,8 +703,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 \ @@ -813,8 +813,9 @@ s-zdefaultcc: Makefile $(STAMP) $@ mostlyclean-local: - -chmod -R u+w check-go-dir - rm -rf check-go-dir check-runtime-dir cgo-test-dir carchive-test-dir + if test -d check-go-dir; then chmod -R u+w check-go-dir; fi + rm -rf check-go-dir check-runtime-dir cgo-test-dir carchive-test-dir \ + check-vet-dir gocache-test @NATIVE_TRUE@go$(EXEEXT): $(go_cmd_go_files) $(LIBGOTOOL) $(LIBGODEP) @NATIVE_TRUE@ $(GOLINK) $(go_cmd_go_files) $(LIBGOTOOL) $(LIBS) $(NET_LIBS) |