various: use $GCFLAGS and $GCIMPORTS like Make does

R=golang-dev, rsc
CC=golang-dev
https://golang.org/cl/5489065

diff --git a/doc/codelab/wiki/Makefile b/doc/codelab/wiki/Makefile
index 55210116d900d6145665bf63817e4d7feab291ed..233917f2c61d419fab20996c29fc481486658f9a 100644 (file)
--- a/doc/codelab/wiki/Makefile
+++ b/doc/codelab/wiki/Makefile
@@ -21,5 +21,5 @@ test: get.bin
        $(LD) -o $@ $<
 
 %.$O: %.go
-       $(GC) $*.go
+       $(GC) $(GCFLAGS) $(GCIMPORTS) $*.go
 

diff --git a/misc/cgo/gmp/Makefile b/misc/cgo/gmp/Makefile
index fc6209f279d7b9262f036aac47e26da694e992c4..d9390c146bfbbf774063b6e351ecbae55e31f686 100644 (file)
--- a/misc/cgo/gmp/Makefile
+++ b/misc/cgo/gmp/Makefile
@@ -28,11 +28,11 @@ include ../../../src/Make.pkg
 
 # Computes 1000 digits of pi; single-threaded.
 pi: install pi.go
-       $(GC) pi.go
+       $(GC) $(GCFLAGS) $(GCIMPORTS) pi.go
        $(LD) -o $@ pi.$O
 
 # Computes 200 Fibonacci numbers; multi-threaded.
 fib: install fib.go
-       $(GC) fib.go
+       $(GC) $(GCFLAGS) $(GCIMPORTS) fib.go
        $(LD) -o $@ fib.$O
 

diff --git a/misc/cgo/life/Makefile b/misc/cgo/life/Makefile
index 39ec13be2816db3e0ab1852695097377e12244e0..1568a67f6d9889016d0bec95f89b3ae2bf4afd44 100644 (file)
--- a/misc/cgo/life/Makefile
+++ b/misc/cgo/life/Makefile
@@ -11,7 +11,7 @@ CGOFILES=\
 
 CGO_OFILES=\
        c-life.o\
-       
+
 ifeq ($(GOOS),windows)
 ifeq ($(GOARCH),amd64)
 CGO_OFILES+=\
@@ -31,5 +31,5 @@ CLEANFILES+=life
 include ../../../src/Make.pkg
 
 life: install main.go
-       $(GC) main.go
+       $(GC) $(GCFLAGS) $(GCIMPORTS) main.go
        $(LD) -o $@ main.$O

diff --git a/misc/cgo/stdio/Makefile b/misc/cgo/stdio/Makefile
index 3f7a4c01c3f0d885b080510ed8976a82f4f143c4..586132b3cfa8c3169143854d40d4a46979a5bfc7 100644 (file)
--- a/misc/cgo/stdio/Makefile
+++ b/misc/cgo/stdio/Makefile
@@ -13,5 +13,5 @@ CLEANFILES+=hello fib chain run.out
 include ../../../src/Make.pkg
 
 %: install %.go
-       $(GC) $*.go
+       $(GC) $(GCFLAGS) $(GCIMPORTS) $*.go
        $(LD) -o $@ $*.$O

diff --git a/misc/cgo/testso/Makefile b/misc/cgo/testso/Makefile
index bee80af56423c6231da4a50ced233c3086581443..e472cf2124949ede8fa4eae6d766c48dbecd2f15 100644 (file)
--- a/misc/cgo/testso/Makefile
+++ b/misc/cgo/testso/Makefile
@@ -18,5 +18,5 @@ libcgoso.so: cgoso_c.c
        gcc cgoso_c.c -fPIC -o $@ $(_CGO_CFLAGS_$(GOARCH)) $(_CGO_LDFLAGS_$(GOOS))
 
 out: install main.go
-       $(GC) main.go
+       $(GC) $(GCFLAGS) $(GCIMPORTS) main.go
        $(LD) -o $@ main.$O

diff --git a/misc/swig/callback/Makefile b/misc/swig/callback/Makefile
index fde0d107bbd70982535ca2cdd83b1f1a14fdb4c2..0ca33ef6041df1084a234459afb4b71a7868956c 100644 (file)
--- a/misc/swig/callback/Makefile
+++ b/misc/swig/callback/Makefile
@@ -13,5 +13,5 @@ CLEANFILES+=run
 include ../../../src/Make.pkg
 
 %: install %.go
-       $(GC) $*.go
+       $(GC) $(GCFLAGS) $(GCIMPORTS) $*.go
        $(LD) $(SWIG_RPATH) -o $@ $*.$O

diff --git a/misc/swig/stdio/Makefile b/misc/swig/stdio/Makefile
index e7d330587c486634d89b63774e32fa1c76bbc9d8..0f23345e4dbc738619cd9fcac3f5784b4911b29f 100644 (file)
--- a/misc/swig/stdio/Makefile
+++ b/misc/swig/stdio/Makefile
@@ -13,5 +13,5 @@ CLEANFILES+=hello
 include ../../../src/Make.pkg
 
 %: install %.go
-       $(GC) $*.go
+       $(GC) $(GCFLAGS) $(GCIMPORTS) $*.go
        $(LD) $(SWIG_RPATH) -o $@ $*.$O

diff --git a/src/cmd/goyacc/Makefile b/src/cmd/goyacc/Makefile
index 87b3470c6a3c1f697a12312033212efd46a8eb80..a616e853485b3373ed12a6e076c6c0368d5adba5 100644 (file)
--- a/src/cmd/goyacc/Makefile
+++ b/src/cmd/goyacc/Makefile
@@ -12,7 +12,7 @@ include ../../Make.cmd
 
 units: goyacc units.y
        ./goyacc -p units_ units.y
-       $(GC) y.go
+       $(GC) $(GCFLAGS) $(GCIMPORTS) y.go
        $(LD) -o units y.$O
 
 CLEANFILES += units y.go y.output

diff --git a/src/pkg/encoding/gob/Makefile b/src/pkg/encoding/gob/Makefile
index 6c7693cba36eb36d33f29fa745016dcf117725a1..3847edb20b5f98f7bb803e599877b8a5119d63ff 100644 (file)
--- a/src/pkg/encoding/gob/Makefile
+++ b/src/pkg/encoding/gob/Makefile
@@ -22,4 +22,4 @@ dump: dump.$O
        $(LD) -o dump $<
 
 dump.$O:       dump.go
-       $(GC) $<
+       $(GC) $(GCFLAGS) $(GCIMPORTS) $<

diff --git a/src/pkg/exp/norm/Makefile b/src/pkg/exp/norm/Makefile
index b3eca1064c8d2f48069b1f27c4884e95008a9ec3..b4faa249aca60d69493e136669bfd9bdf4b9ad83 100644 (file)
--- a/src/pkg/exp/norm/Makefile
+++ b/src/pkg/exp/norm/Makefile
@@ -19,15 +19,15 @@ include ../../../Make.pkg
 CLEANFILES+=maketables maketesttables
 
 maketables: maketables.go triegen.go
-       $(GC) maketables.go triegen.go
+       $(GC) $(GCFLAGS) $(GCIMPORTS) maketables.go triegen.go
        $(LD) -o maketables maketables.$O
 
 maketesttables: maketesttables.go triegen.go
-       $(GC) maketesttables.go triegen.go
+       $(GC) $(GCFLAGS) $(GCIMPORTS) maketesttables.go triegen.go
        $(LD) -o maketesttables maketesttables.$O
 
 normregtest: normregtest.go
-       $(GC) normregtest.go
+       $(GC) $(GCFLAGS) $(GCIMPORTS) normregtest.go
        $(LD) -o normregtest normregtest.$O
 
 tables:        maketables

diff --git a/src/pkg/go/doc/Makefile b/src/pkg/go/doc/Makefile
index 0330757661ff4067610d375b312f7bc6ad01de9d..2a421c3e6bf101fae2daf0b7b6e5716ab8f67a4e 100644 (file)
--- a/src/pkg/go/doc/Makefile
+++ b/src/pkg/go/doc/Makefile
@@ -15,5 +15,5 @@ include ../../../Make.pkg
 # Script to test heading detection heuristic
 CLEANFILES+=headscan
 headscan: headscan.go
-       $(GC) headscan.go
+       $(GC) $(GCFLAGS) $(GCIMPORTS) headscan.go
        $(LD) -o headscan headscan.$(O)

diff --git a/src/pkg/unicode/Makefile b/src/pkg/unicode/Makefile
index 55ed5b2d958e9c1680e66e6dcebb268cbcb111b9..4472a6c67e0476c821e377597a99065b3169e6e6 100644 (file)
--- a/src/pkg/unicode/Makefile
+++ b/src/pkg/unicode/Makefile
@@ -17,7 +17,7 @@ include ../../Make.pkg
 CLEANFILES+=maketables
 
 maketables: maketables.go
-       $(GC) maketables.go
+       $(GC) $(GCFLAGS) $(GCIMPORTS) maketables.go
        $(LD) -o maketables maketables.$O
 
 tables:        maketables

diff --git a/test/bench/garbage/Makefile b/test/bench/garbage/Makefile
index 916add779522a279ea317fe9da4684204413a7a6..cf6568f9ee76322ef2daa1f64417cafae9a28421 100644 (file)
--- a/test/bench/garbage/Makefile
+++ b/test/bench/garbage/Makefile
@@ -12,7 +12,7 @@ ALL=\
 all: $(addsuffix .out, $(ALL))
 
 %.$O: %.go stats.go
-       $(GC) $*.go stats.go
+       $(GC) $(GCFLAGS) $(GCIMPORTS) $*.go stats.go
 
 %.out: %.$O
        $(LD) -o $@ $*.$O