summaryrefslogtreecommitdiff
path: root/gotools
diff options
context:
space:
mode:
authorRainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>2018-09-26 12:56:09 +0000
committerRainer Orth <ro@gcc.gnu.org>2018-09-26 12:56:09 +0000
commit19071aa48cc07a78b0ccbafd8f3e8df61607be06 (patch)
tree2185b2c3ac582188650db3365b5a373b3cae782f /gotools
parentce6f08888905bb217b9a4cff8a0704e240ec5c46 (diff)
Ignore chmod errors during mostlyclean-local, check-go-tool
* Makefile.am (mostlyclean-local): Ignore chmod errors. (check-go-tool): Likewise. * Makefile.in: Regenerate. From-SVN: r264641
Diffstat (limited to 'gotools')
-rw-r--r--gotools/ChangeLog6
-rw-r--r--gotools/Makefile.am4
-rw-r--r--gotools/Makefile.in6
3 files changed, 11 insertions, 5 deletions
diff --git a/gotools/ChangeLog b/gotools/ChangeLog
index afcd7a211c1..c35b79753f6 100644
--- a/gotools/ChangeLog
+++ b/gotools/ChangeLog
@@ -1,3 +1,9 @@
+2018-09-26 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>
+
+ * Makefile.am (mostlyclean-local): Ignore chmod errors.
+ (check-go-tool): Likewise.
+ * Makefile.in: Regenerate.
+
2018-09-24 Ian Lance Taylor <iant@golang.org>
* Makefile.am (mostlyclean-local): Run chmod on check-go-dir to
diff --git a/gotools/Makefile.am b/gotools/Makefile.am
index cb4ffe7a66f..24967dd3ce6 100644
--- a/gotools/Makefile.am
+++ b/gotools/Makefile.am
@@ -123,7 +123,7 @@ MOSTLYCLEANFILES = \
*.sent
mostlyclean-local:
- chmod -R u+w check-go-dir
+ -chmod -R u+w check-go-dir
rm -rf check-go-dir check-runtime-dir cgo-test-dir carchive-test-dir
if NATIVE
@@ -229,7 +229,7 @@ ECHO_ENV = PATH=`echo $(abs_builddir):$${PATH} | sed 's,::*,:,g;s,^:*,,;s,:*$$,,
# check-go-tool runs `go test cmd/go` in our environment.
check-go-tool: go$(EXEEXT) $(noinst_PROGRAMS) check-head check-gccgo check-gcc
- chmod -R u+w check-go-dir
+ -chmod -R u+w check-go-dir
rm -rf check-go-dir cmd_go-testlog
$(MKDIR_P) check-go-dir/src/cmd/go
cp $(cmdsrcdir)/go/*.go check-go-dir/src/cmd/go/
diff --git a/gotools/Makefile.in b/gotools/Makefile.in
index acadfc64016..ce69d89fedd 100644
--- a/gotools/Makefile.in
+++ b/gotools/Makefile.in
@@ -637,8 +637,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@install-exec-local:
@NATIVE_FALSE@uninstall-local:
+@NATIVE_FALSE@install-exec-local:
clean: clean-am
clean-am: clean-binPROGRAMS clean-generic clean-noinstPROGRAMS \
@@ -744,7 +744,7 @@ s-zdefaultcc: Makefile
$(STAMP) $@
mostlyclean-local:
- chmod -R u+w check-go-dir
+ -chmod -R u+w check-go-dir
rm -rf check-go-dir check-runtime-dir cgo-test-dir carchive-test-dir
@NATIVE_TRUE@go$(EXEEXT): $(go_cmd_go_files) $(LIBGOTOOL) $(LIBGODEP)
@@ -808,7 +808,7 @@ mostlyclean-local:
# check-go-tool runs `go test cmd/go` in our environment.
@NATIVE_TRUE@check-go-tool: go$(EXEEXT) $(noinst_PROGRAMS) check-head check-gccgo check-gcc
-@NATIVE_TRUE@ chmod -R u+w check-go-dir
+@NATIVE_TRUE@ -chmod -R u+w check-go-dir
@NATIVE_TRUE@ rm -rf check-go-dir cmd_go-testlog
@NATIVE_TRUE@ $(MKDIR_P) check-go-dir/src/cmd/go
@NATIVE_TRUE@ cp $(cmdsrcdir)/go/*.go check-go-dir/src/cmd/go/