[dev.cc] build: do not 'clean -i std' between dist and go_bootstrap

Executing 'clean -i std' removes installed Go programs,
including the toolchain binaries we need for building.
It's not clear why the 'clean -i std' is here in the first place.
cmd/dist just removed the entire pkg tree, so everything is new.
The only reason for 'clean -i std' would be if you don't trust
that dist compiled the packages properly. If that's true for
some reason, we can fix cmd/dist, or add -a to the install
commands that follow. Perhaps clean -i std should not
remove tools, or perhaps std should not expand to any tools.
Not sure.

Also remove banner from make.bat and make.rc that was
already removed from make.bash. cmd/dist prints it now.

Also fix array size error in liblink/objfile.c.

Fixes dev.cc build.

Change-Id: I60855e001a682efce55ad9aa307a8f3ee47f7366
Reviewed-on: https://go-review.googlesource.com/3100
Reviewed-by: Russ Cox <rsc@golang.org>

diff --git a/src/liblink/objfile.c b/src/liblink/objfile.c
index 26a7e3ad544f97d3d29c3f31b1cc3cbd687e4690..6711aaf77697a6b87408598a9316d5134673aada 100644 (file)
--- a/src/liblink/objfile.c
+++ b/src/liblink/objfile.c
@@ -124,7 +124,7 @@ void        writeobjdirect(Link*, Biobuf*);
 void
 writeobj(Link *ctxt, Biobuf *b)
 {
-       char *cmd[2];
+       char *cmd[3];
        
        // TODO(rsc): Use 'go tool objwriter' to write object file,
        // allowing the bulk of liblink to be moved into Go.

diff --git a/src/make.bash b/src/make.bash
index e962f04fcfe5721cf3ed35fa757ecb86b843c45e..e6c3fd02d0f1dc197de7749a907b9f7adb744b59 100755 (executable)
--- a/src/make.bash
+++ b/src/make.bash
@@ -149,7 +149,6 @@ fi
 ./cmd/dist/dist bootstrap $buildall $GO_DISTFLAGS -v # builds go_bootstrap
 # Delay move of dist tool to now, because bootstrap may clear tool directory.
 mv cmd/dist/dist "$GOTOOLDIR"/dist
-"$GOTOOLDIR"/go_bootstrap clean -i std
 echo
 
 if [ "$GOHOSTARCH" != "$GOARCH" -o "$GOHOSTOS" != "$GOOS" ]; then

diff --git a/src/make.bat b/src/make.bat
index fab9c88ff6e6f243168549e24e6dcbb667953caa..ba3469e69e08832134a2f97160bbf8d870276b81 100644 (file)
--- a/src/make.bat
+++ b/src/make.bat
@@ -71,14 +71,12 @@ echo.
 if x%1==x--dist-tool goto copydist
 if x%2==x--dist-tool goto copydist
 
-echo ##### Building compilers and Go bootstrap tool.
 set buildall=-a
 if x%1==x--no-clean set buildall=
 .\cmd\dist\dist bootstrap %buildall% -v
 if errorlevel 1 goto fail
 :: Delay move of dist tool to now, because bootstrap cleared tool directory.
 move .\cmd\dist\dist.exe "%GOTOOLDIR%\dist.exe"
-"%GOTOOLDIR%\go_bootstrap" clean -i std
 echo.
 
 if not %GOHOSTARCH% == %GOARCH% goto localbuild

diff --git a/src/make.rc b/src/make.rc
index 5fe30aced7ca2e5ba3ec400009b1946313e66437..593ebc8f2fe55b424a92c0a9ac65187620fb3726 100755 (executable)
--- a/src/make.rc
+++ b/src/make.rc
@@ -72,14 +72,12 @@ if(~ $1 --dist-tool){
        exit
 }
 
-echo '# Building compilers and Go bootstrap tool for host,' $GOHOSTOS/$GOHOSTARCH^.
 buildall = -a
 if(~ $1 --no-clean)
        buildall = ()
 ./cmd/dist/dist bootstrap $buildall -v # builds go_bootstrap
 # Delay move of dist tool to now, because bootstrap may clear tool directory.
 mv cmd/dist/dist $GOTOOLDIR/dist
-$GOTOOLDIR/go_bootstrap clean -i std
 echo
 
 # Run only one process at a time on 9vx.