Commit 6f6b7e3a authored by Gustavo Niemeyer's avatar Gustavo Niemeyer Committed by Rob Pike

goinstall: Fix template to use exported fields

It's currently broken due to f6d5bac536c5.

R=r, r2
CC=golang-dev
https://golang.org/cl/3967041
parent 699864b6
...@@ -83,34 +83,34 @@ func makeMakefile(dir, pkg string) ([]byte, os.Error) { ...@@ -83,34 +83,34 @@ func makeMakefile(dir, pkg string) ([]byte, os.Error) {
// makedata is the data type for the makefileTemplate. // makedata is the data type for the makefileTemplate.
type makedata struct { type makedata struct {
pkg string // package import path Pkg string // package import path
goFiles []string // list of non-cgo .go files GoFiles []string // list of non-cgo .go files
cgoFiles []string // list of cgo .go files CgoFiles []string // list of cgo .go files
oFiles []string // list of ofiles for cgo OFiles []string // list of ofiles for cgo
} }
var makefileTemplate = template.MustParse(` var makefileTemplate = template.MustParse(`
include $(GOROOT)/src/Make.inc include $(GOROOT)/src/Make.inc
TARG={pkg} TARG={Pkg}
{.section goFiles} {.section GoFiles}
GOFILES=\ GOFILES=\
{.repeated section goFiles} {.repeated section GoFiles}
{@}\ {@}\
{.end} {.end}
{.end} {.end}
{.section cgoFiles} {.section CgoFiles}
CGOFILES=\ CGOFILES=\
{.repeated section cgoFiles} {.repeated section CgoFiles}
{@}\ {@}\
{.end} {.end}
{.end} {.end}
{.section oFiles} {.section OFiles}
CGO_OFILES=\ CGO_OFILES=\
{.repeated section oFiles} {.repeated section OFiles}
{@}\ {@}\
{.end} {.end}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment