code review 6180044: build: remove stray src/pkg/runtime/z* before build

cmd/dist: remove stray src/pkg/runtime/z* when cleaning

[minux1, 2012-05-03 10:55:28]

Hello golang-dev@googlegroups.com (cc: golang-dev@googlegroups.com),

I'd like you to review this change to
https://code.google.com/p/go/

[bradfitz, 2012-05-03 11:21:49]

LGTM
 On May 3, 2012 8:55 PM, <minux.ma@gmail.com> wrote:

> Reviewers: golang-dev_googlegroups.com,
>
> Message:
> Hello golang-dev@googlegroups.com (cc: golang-dev@googlegroups.com),
>
> I'd like you to review this change to
> https://code.google.com/p/go/
>
>
> Description:
> build: remove stray src/pkg/runtime/z* before build
>
> Please review this at
http://codereview.appspot.com/**6180044/<http://codereview.appspot.com/6180044/>
>
> Affected files:
>  M src/make.bash
>  M src/make.bat
>  M src/make.rc
>
>
> Index: src/make.bash
> ==============================**==============================**=======
> --- a/src/make.bash
> +++ b/src/make.bash
> @@ -79,6 +79,7 @@
>
>  # Clean old generated file that will cause problems in the build.
>  rm -f ./pkg/runtime/runtime_defs.go
> +rm -f ./pkg/runtime/z*
>
>  # Finally!  Run the build.
>
> Index: src/make.bat
> ==============================**==============================**=======
> --- a/src/make.bat
> +++ b/src/make.bat
> @@ -44,6 +44,7 @@
>
>  :: Clean old generated file that will cause problems in the build.
>  del /F ".\pkg\runtime\runtime_defs.**go" 2>NUL
> +del /F .\pkg\runtime\z* 2>NUL
>
>  :: Grab default GOROOT_FINAL and set GOROOT for build.
>  :: The expression %VAR:\=\\% means to take %VAR%
> Index: src/make.rc
> ==============================**==============================**=======
> --- a/src/make.rc
> +++ b/src/make.rc
> @@ -33,7 +33,8 @@
>  }
>
>  # Clean old generated file that will cause problems in the build.
> -rm -rf ./pkg/runtime/runtime_defs.go
> +rm -f ./pkg/runtime/runtime_defs.go
> +rm -f ./pkg/runtime/z*
>
>  # Determine the host compiler toolchain.
>  eval `{grep '^(CC|LD|O)=' /$objtype/mkfile}
>
>
>

[dave_cheney.net, 2012-05-03 11:26:19]

LGTM. Thanks. 

On 03/05/2012, at 20:55, minux.ma@gmail.com wrote:

> Reviewers: golang-dev_googlegroups.com,
> 
> Message:
> Hello golang-dev@googlegroups.com (cc: golang-dev@googlegroups.com),
> 
> I'd like you to review this change to
> https://code.google.com/p/go/
> 
> 
> Description:
> build: remove stray src/pkg/runtime/z* before build
> 
> Please review this at http://codereview.appspot.com/6180044/
> 
> Affected files:
>  M src/make.bash
>  M src/make.bat
>  M src/make.rc
> 
> 
> Index: src/make.bash
> ===================================================================
> --- a/src/make.bash
> +++ b/src/make.bash
> @@ -79,6 +79,7 @@
> 
> # Clean old generated file that will cause problems in the build.
> rm -f ./pkg/runtime/runtime_defs.go
> +rm -f ./pkg/runtime/z*
> 
> # Finally!  Run the build.
> 
> Index: src/make.bat
> ===================================================================
> --- a/src/make.bat
> +++ b/src/make.bat
> @@ -44,6 +44,7 @@
> 
> :: Clean old generated file that will cause problems in the build.
> del /F ".\pkg\runtime\runtime_defs.go" 2>NUL
> +del /F .\pkg\runtime\z* 2>NUL
> 
> :: Grab default GOROOT_FINAL and set GOROOT for build.
> :: The expression %VAR:\=\\% means to take %VAR%
> Index: src/make.rc
> ===================================================================
> --- a/src/make.rc
> +++ b/src/make.rc
> @@ -33,7 +33,8 @@
> }
> 
> # Clean old generated file that will cause problems in the build.
> -rm -rf ./pkg/runtime/runtime_defs.go
> +rm -f ./pkg/runtime/runtime_defs.go
> +rm -f ./pkg/runtime/z*
> 
> # Determine the host compiler toolchain.
> eval `{grep '^(CC|LD|O)=' /$objtype/mkfile}
> 
> 

[rsc1, 2012-05-03 12:08:45]

Doesn't dist do this already?

[lstoakes, 2012-05-03 12:13:11]

On 3 May 2012 13:08, Russ Cox <rsc@google.com> wrote:

> Doesn't dist do this already?
>
As a data point, it didn't seem to remove these files on a recent build for
me:-

lstoakes@demon:~/Dropbox/code/go/src$ ./make.bash
...
pkg/runtime
/Users/lstoakes/Dropbox/code/go/src/pkg/runtime/malloc.goc:63[/Users/lstoakes/Dropbox/code/go/src/pkg/runtime/zmalloc_amd64.c:53]
not enough function ar
guments: runtime.MHeap_Alloc

go tool dist: FAILED:
/Users/lstoakes/Dropbox/code/go/pkg/tool/darwin_amd64/6c -FVw -I $WORK
-DGOOS_darwin -DGOARCH_amd64 -o $WORK/zmalloc_amd64.o /User
s/lstoakes/Dropbox/code/go/src/pkg/runtime/zmalloc_amd64.c

-- 
Lorenzo Stoakes
http://www.codegrunt.co.uk

[rsc1, 2012-05-03 12:45:39]

On Thu, May 3, 2012 at 8:12 AM, Lorenzo Stoakes <lstoakes@gmail.com> wrote:
> As a data point, it didn't seem to remove these files on a recent build for
> me:-

Yes, I've seen that too.  But I'd like to understand why.
cmd/dist is supposed to rebuild the z files, and it
does not appear that malloc.goc went away, so why is
zmalloc_amd64.c not being rebuilt?

Russ

[minux1, 2012-05-03 12:52:06]

On Thu, May 3, 2012 at 8:45 PM, Russ Cox <rsc@google.com> wrote:

> On Thu, May 3, 2012 at 8:12 AM, Lorenzo Stoakes <lstoakes@gmail.com>
> wrote:
> > As a data point, it didn't seem to remove these files on a recent build
> for
> > me:-
>
> Yes, I've seen that too.  But I'd like to understand why.
> cmd/dist is supposed to rebuild the z files, and it
> does not appear that malloc.goc went away, so why is
> zmalloc_amd64.c not being rebuilt?

because recent Plan 9 dist build CL changed cmd/dist to generate
zmalloc_linux_amd64.c
instead of zmalloc_amd64.c

[rsc1, 2012-05-03 12:54:51]

Okay, but even so it seems like dist should be the one removing these.
The reason we have the dist command is to avoid writing shell scripts
for multiple systems.

Russ

[minux1, 2012-05-03 16:47:22]

On 2012/05/03 12:54:51, rsc1 wrote:
> Okay, but even so it seems like dist should be the one removing these.
> The reason we have the dist command is to avoid writing shell scripts
> for multiple systems.
Done. PTAL.

[rsc, 2012-05-03 16:48:29]

LGTM
Thanks!

[minux1, 2012-05-03 16:59:05]

*** Submitted as http://code.google.com/p/go/source/detail?r=26fc3f8aa53e ***

cmd/dist: remove stray src/pkg/runtime/z* when cleaning

R=golang-dev, bradfitz, dave, rsc, lstoakes, rsc
CC=golang-dev
http://codereview.appspot.com/6180044