qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-09-25 01:20:13 -06:00
Code Releases Activity

cmd/dist: redo flag-passing for bootstrap

Browse Source 
This ought to revert the bad effects of
https://go-review.googlesource.com/#/c/20775/
If you don't pass BOOT_GO_GCFLAGS, you get the
old behavior.

Tweaked to allow multiple space-separated flags in
BOOT_GO_GCFLAGS.

Change-Id: I2a22a04211b4535d1c5a8ec7a8a78cb051161c31
Reviewed-on: https://go-review.googlesource.com/20871
Run-TryBot: David Chase <drchase@google.com>
Reviewed-by: Russ Cox <rsc@golang.org>
This commit is contained in:
David Chase 2016-03-18 13:35:34 -04:00
parent 40bd28f0c7
commit 982322769c
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/cmd/dist/build.go vendored
View File

@ -167,7 +167,7 @@ func xinit() {
goextlinkenabled = b
}
gogcflags = os.Getenv("GO_GCFLAGS")
gogcflags = os.Getenv("BOOT_GO_GCFLAGS")
b = os.Getenv("CC")
if b == "" {
@ -691,7 +691,7 @@ func install(dir string) {
}
compile := []string{pathf("%s/compile", tooldir), "-pack", "-o", b, "-p", pkg}
if gogcflags != "" {
compile = append(compile, gogcflags)
compile = append(compile, strings.Fields(gogcflags)...)
}
if dir == "runtime" {
compile = append(compile, "-+", "-asmhdr", pathf("%s/go_asm.h", workdir))

2
src/make.bash
View File

@ -151,8 +151,8 @@ if [ "$1" = "--no-clean" ]; then
buildall=""
shift
fi
./cmd/dist/dist bootstrap $buildall $GO_DISTFLAGS -v # builds go_bootstrap
GO_GCFLAGS="$BOOT_GO_GCFLAGS" ./cmd/dist/dist bootstrap $buildall $GO_DISTFLAGS -v # builds go_bootstrap
# Delay move of dist tool to now, because bootstrap may clear tool directory.
mv cmd/dist/dist "$GOTOOLDIR"/dist
echo