aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorRuss Cox <rsc@golang.org>2013-03-11 16:50:44 -0400
committerRuss Cox <rsc@golang.org>2013-03-11 16:50:44 -0400
commit7b4ac31cab7480084f45c2890c4ebd877944bc49 (patch)
tree31a6568a6a381402ea8d6c5723a11da6ebc30c98 /src
parentd74d0b269de395aa4be7a7bc04fda23cde9ce34f (diff)
downloadgo-7b4ac31cab7480084f45c2890c4ebd877944bc49.tar.xz
cmd/dist: make cc rule match what cmd/go uses
We added -I$GOROOT/pkg/$GOOS_$GOARCH in cmd/go (I think for use by cgo and swig, primarily) but didn't update cmd/dist. I was testing some other code and found that my changes built with cmd/go but failed during the initial bootstrap. Make them match again. R=golang-dev, iant CC=golang-dev https://golang.org/cl/7707044
Diffstat (limited to 'src')
-rw-r--r--src/cmd/dist/build.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/cmd/dist/build.c b/src/cmd/dist/build.c
index bac7439e61..30e8b3a550 100644
--- a/src/cmd/dist/build.c
+++ b/src/cmd/dist/build.c
@@ -939,6 +939,8 @@ install(char *dir)
}
vadd(&compile, "-I");
vadd(&compile, workdir);
+ vadd(&compile, "-I");
+ vadd(&compile, bprintf(&b, "%s/pkg/%s_%s", goroot, goos, goarch));
vadd(&compile, "-D");
vadd(&compile, bprintf(&b, "GOOS_%s", goos));
vadd(&compile, "-D");