code review 5641051: cmd/dist: respect $CC, as quietgcc.bash used to

cmd/dist: respect $CC, as quietgcc.bash used to

[rsc, 2012-02-08 05:18:27]

Hello golang-dev@googlegroups.com,

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

[dsymonds, 2012-02-08 05:20:38]

LGTM

[r, 2012-02-08 05:20:41]

LGTM

[iant2, 2012-02-08 05:21:46]

LGTM

rsc@golang.org writes:

> Reviewers: golang-dev_googlegroups.com,
>
> Message:
> Hello golang-dev@googlegroups.com,
>
> I'd like you to review this change to
> https://code.google.com/p/go/
>
>
> Description:
> cmd/dist: respect $CC, as quietgcc.bash used to
>
> Please review this at http://codereview.appspot.com/5641051/
>
> Affected files:
>   M src/cmd/dist/build.c
>
>
> Index: src/cmd/dist/build.c
> ===================================================================
> --- a/src/cmd/dist/build.c
> +++ b/src/cmd/dist/build.c
> @@ -22,6 +22,7 @@
>  char *goversion;
>  char *slash;	// / for unix, \ for windows
>  char *default_goroot = DEFAULT_GOROOT;
> +char *cc;
>
>  static bool shouldbuild(char*, char*);
>  static void copy(char*, char*);
> @@ -336,8 +337,7 @@
>   */
>
>  // gccargs is the gcc command line to use for compiling a single C file.
> -static char *gccargs[] = {
> -	"gcc",
> +static char *proto_gccargs[] = {
>  	"-Wall",
>  	"-Wno-sign-compare",
>  	"-Wno-missing-braces",
> @@ -352,6 +352,8 @@
>  	"-c",
>  };
>
> +static Vec gccargs;
> +
>  // deptab lists changes to the default dependencies for a given prefix.
>  // deps ending in /* read the whole directory; deps beginning with -
>  // exclude files with that prefix.
> @@ -513,6 +515,16 @@
>  	vinit(&lib);
>  	vinit(&extra);
>  	
> +	// set up gcc command line on first run.
> +	if(gccargs.len == 0) {
> +		xgetenv(&b, "CC");
> +		if(b.len == 0)
> +			bprintf(&b, "gcc");
> +		splitfields(&gccargs, bstr(&b));
> +		for(i=0; i<nelem(proto_gccargs); i++)
> +			vadd(&gccargs, proto_gccargs[i]);
> +	}
> +	
>  	// path = full path to dir.
>  	bpathf(&path, "%s/src/%s", goroot, dir);
>  	name = lastelem(dir);
> @@ -732,7 +744,7 @@
>  		vreset(&compile);
>  		if(!isgo) {
>  			// C library or tool.
> -			vcopy(&compile, gccargs, nelem(gccargs));
> +			vcopy(&compile, gccargs.p, gccargs.len);
>  			if(streq(gohostarch, "amd64"))
>  				vadd(&compile, "-m64");
>  			else if(streq(gohostarch, "386"))

[rsc, 2012-02-08 05:22:43]

*** Submitted as 001b807ba435 ***

cmd/dist: respect $CC, as quietgcc.bash used to

R=golang-dev, r, iant
CC=golang-dev
http://codereview.appspot.com/5641051