clones/go
1
0
Fork 0
mirror of https://github.com/golang/go.git synced 2024-09-30 14:57:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
R=golang-dev, r, iant
CC=golang-dev
https://golang.org/cl/5641051
This commit is contained in:
Russ Cox 2012-02-08 00:22:38 -05:00
parent 1a761fd002
commit 3f6a517db6
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/cmd/dist/build.c vendored
View File

@ -336,8 +336,7 @@ setup(void)
*/ */
// gccargs is the gcc command line to use for compiling a single C file. // gccargs is the gcc command line to use for compiling a single C file.
static char *gccargs[] = { static char *proto_gccargs[] = {
"gcc",
"-Wall", "-Wall",
"-Wno-sign-compare", "-Wno-sign-compare",
"-Wno-missing-braces", "-Wno-missing-braces",
@ -352,6 +351,8 @@ static char *gccargs[] = {
"-c", "-c",
}; };
static Vec gccargs;
// deptab lists changes to the default dependencies for a given prefix. // deptab lists changes to the default dependencies for a given prefix.
// deps ending in /* read the whole directory; deps beginning with - // deps ending in /* read the whole directory; deps beginning with -
// exclude files with that prefix. // exclude files with that prefix.
@ -513,6 +514,16 @@ install(char *dir)
vinit(&lib); vinit(&lib);
vinit(&extra); 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. // path = full path to dir.
bpathf(&path, "%s/src/%s", goroot, dir); bpathf(&path, "%s/src/%s", goroot, dir);
name = lastelem(dir); name = lastelem(dir);
@ -732,7 +743,7 @@ install(char *dir)
vreset(&compile); vreset(&compile);
if(!isgo) { if(!isgo) {
// C library or tool. // C library or tool.
vcopy(&compile, gccargs, nelem(gccargs)); vcopy(&compile, gccargs.p, gccargs.len);
if(streq(gohostarch, "amd64")) if(streq(gohostarch, "amd64"))
vadd(&compile, "-m64"); vadd(&compile, "-m64");
else if(streq(gohostarch, "386")) else if(streq(gohostarch, "386"))