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

diff --git a/src/cmd/gc/mkbuiltin b/src/cmd/gc/mkbuiltin
index 5d0d73cc4057d2752a0f34b33eb2642be7695117..e0c29c1bb410305f3955c07b6eb0afe44c8fb157 100755 (executable)
--- 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