diff options
| author | Russ Cox <rsc@golang.org> | 2015-02-04 16:11:28 -0500 |
|---|---|---|
| committer | Russ Cox <rsc@golang.org> | 2015-02-04 16:12:58 -0500 |
| commit | 8db173b85e1a151b61b38a15c9a4c97beac74191 (patch) | |
| tree | 3ab5f1978204f06c02b6955c5e7e353c42cef2cd /src/make.bash | |
| parent | 25c140aaa0cebdd77886475dfd82b06e8f684e29 (diff) | |
| parent | b8fcae02b076cdef0bbef5bce5de090409858fba (diff) | |
| download | go-8db173b85e1a151b61b38a15c9a4c97beac74191.tar.gz go-8db173b85e1a151b61b38a15c9a4c97beac74191.zip | |
[dev.cc] all: merge master (b8fcae0) into dev.cc
Change-Id: I2aa1d0b0c4cf7632a54e843810959b468e3812ab
Diffstat (limited to 'src/make.bash')
| -rwxr-xr-x | src/make.bash | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/make.bash b/src/make.bash index e6c3fd02d0..215fedd6ee 100755 --- a/src/make.bash +++ b/src/make.bash @@ -25,9 +25,6 @@ # GO_LDFLAGS: Additional 5l/6l/8l arguments to use when # building the commands. # -# GO_CCFLAGS: Additional 5c/6c/8c arguments to use when -# building. -# # CGO_ENABLED: Controls cgo usage during the build. Set it to 1 # to include all cgo related files, .c and .go file with "cgo" # build directive, in the build. Set it to 0 to ignore them. @@ -156,12 +153,12 @@ if [ "$GOHOSTARCH" != "$GOARCH" -o "$GOHOSTOS" != "$GOOS" ]; then # CC_FOR_TARGET is recorded as the default compiler for the go tool. When building for the host, however, # use the host compiler, CC, from `cmd/dist/dist env` instead. CC=$CC GOOS=$GOHOSTOS GOARCH=$GOHOSTARCH \ - "$GOTOOLDIR"/go_bootstrap install -ccflags "$GO_CCFLAGS" -gcflags "$GO_GCFLAGS" -ldflags "$GO_LDFLAGS" -v std + "$GOTOOLDIR"/go_bootstrap install -gcflags "$GO_GCFLAGS" -ldflags "$GO_LDFLAGS" -v std echo fi echo "##### Building packages and commands for $GOOS/$GOARCH." -CC=$CC_FOR_TARGET "$GOTOOLDIR"/go_bootstrap install $GO_FLAGS -ccflags "$GO_CCFLAGS" -gcflags "$GO_GCFLAGS" -ldflags "$GO_LDFLAGS" -v std +CC=$CC_FOR_TARGET "$GOTOOLDIR"/go_bootstrap install $GO_FLAGS -gcflags "$GO_GCFLAGS" -ldflags "$GO_LDFLAGS" -v std echo rm -f "$GOTOOLDIR"/go_bootstrap |