summaryrefslogtreecommitdiff
path: root/gotools
diff options
context:
space:
mode:
authorIan Lance Taylor <iant@golang.org>2019-05-27 19:21:22 +0000
committerIan Lance Taylor <ian@gcc.gnu.org>2019-05-27 19:21:22 +0000
commit5c7247b7b7ad2ad27bec55bb39c3064fe32452f0 (patch)
treee95b749ab48d5e89394d8e62887296570d5e0aee /gotools
parent7f63a854004e39660c926c7f6974638650e5fc18 (diff)
Makefile.am (check-go-tool): Only chmod check-go-dir if it exists.
* Makefile.am (check-go-tool): Only chmod check-go-dir if it exists. * Makefile.in: Regenerate. From-SVN: r271669
Diffstat (limited to 'gotools')
-rw-r--r--gotools/ChangeLog6
-rw-r--r--gotools/Makefile.am2
-rw-r--r--gotools/Makefile.in2
3 files changed, 8 insertions, 2 deletions
diff --git a/gotools/ChangeLog b/gotools/ChangeLog
index 20af2b51537..f5639057d7b 100644
--- a/gotools/ChangeLog
+++ b/gotools/ChangeLog
@@ -1,3 +1,9 @@
+2019-05-27 Ian Lance Taylor <iant@golang.org>
+
+ * Makefile.am (check-go-tool): Only chmod check-go-dir if it
+ exists.
+ * Makefile.in: Regenerate.
+
2019-02-28 Ian Lance Taylor <iant@golang.org>
PR go/89406
diff --git a/gotools/Makefile.am b/gotools/Makefile.am
index 41fc8f45f81..4fd07c27b19 100644
--- a/gotools/Makefile.am
+++ b/gotools/Makefile.am
@@ -207,7 +207,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
+ if test -d check-go-dir; then chmod -R u+w check-go-dir; fi
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 0e4ee83def4..1c2237cca9b 100644
--- a/gotools/Makefile.in
+++ b/gotools/Makefile.in
@@ -878,7 +878,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@ if test -d check-go-dir; then chmod -R u+w check-go-dir; fi
@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/