summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRuss Cox <rsc@golang.org>2009-03-30 00:12:56 -0700
committerRuss Cox <rsc@golang.org>2009-03-30 00:12:56 -0700
commitd82542497c5ef540930201ac05a3be4161884ab4 (patch)
tree3ced5c02135d9483c695a2297f59f4fe21f282d0
parentd4306d14f2d0c3c0b7a93ed0b498180b8e6d6a35 (diff)
downloadgolang-d82542497c5ef540930201ac05a3be4161884ab4.tar.gz
don't write cmp's output to the c file.
cope better with p4 not found. R=r DELTA=3 (0 added, 0 deleted, 3 changed) OCL=26877 CL=26879
-rwxr-xr-xsrc/cmd/gc/mkbuiltin6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/cmd/gc/mkbuiltin b/src/cmd/gc/mkbuiltin
index 5d0d73cc4..e0c29c1bb 100755
--- a/src/cmd/gc/mkbuiltin
+++ b/src/cmd/gc/mkbuiltin
@@ -19,10 +19,10 @@ rm -f _builtin.c
# in end user Go repositories.
case "$USER" in
ken | r | rsc)
- if ! cmp _builtin.c builtin.c.boot
+ if ! cmp _builtin.c builtin.c.boot >/dev/null 2>/dev/null
then
- PATH=$PATH:/usr/local/bin
- p4 open builtin.c.boot >/dev/null
+ PATH=$PATH:/usr/local/bin # find p4 on OS X
+ p4 open builtin.c.boot >/dev/null 2>/dev/null || true # if p4 is missing, so be it
cp _builtin.c builtin.c.boot
fi
esac