diff options
| author | Russ Cox <rsc@golang.org> | 2013-06-05 07:14:05 -0400 |
|---|---|---|
| committer | Russ Cox <rsc@golang.org> | 2013-06-05 07:14:05 -0400 |
| commit | 643981bf389b7691f2b896008f21fad863bc017d (patch) | |
| tree | 3b0ed73feb8b7c6ee2d825a751f725f5bb4425c3 /src/cmd/go | |
| parent | d2ea784ad5be081c7f8ad3c032fe99d95d044e7c (diff) | |
| download | go-643981bf389b7691f2b896008f21fad863bc017d.tar.gz | |
cmd/cgo, cmd/go, go/build: sort flag lists
CFLAGS comes before CPPFLAGS.
Also fix one typo CPPCFLAGS.
Cleanup for CL 8248043.
R=golang-dev, iant, alberto.garcia.hierro
CC=golang-dev
https://codereview.appspot.com/9965045
Diffstat (limited to 'src/cmd/go')
| -rw-r--r-- | src/cmd/go/doc.go | 4 | ||||
| -rw-r--r-- | src/cmd/go/list.go | 4 | ||||
| -rw-r--r-- | src/cmd/go/pkg.go | 8 |
3 files changed, 8 insertions, 8 deletions
diff --git a/src/cmd/go/doc.go b/src/cmd/go/doc.go index 2fad261e1..e0d8946bb 100644 --- a/src/cmd/go/doc.go +++ b/src/cmd/go/doc.go @@ -321,13 +321,13 @@ which calls strings.Join. The struct being passed to the template is: CXXFiles []string // .cc, .cxx and .cpp source files HFiles []string // .h, .hh, .hpp and .hxx source files SFiles []string // .s source files - SysoFiles []string // .syso object files to add to archive SwigFiles []string // .swig files SwigCXXFiles []string // .swigcxx files + SysoFiles []string // .syso object files to add to archive // Cgo directives - CgoCPPFLAGS []string // cgo: flags for C preprocessor CgoCFLAGS []string // cgo: flags for C compiler + CgoCPPFLAGS []string // cgo: flags for C preprocessor CgoCXXFLAGS []string // cgo: flags for C++ compiler CgoLDFLAGS []string // cgo: flags for linker CgoPkgConfig []string // cgo: pkg-config names diff --git a/src/cmd/go/list.go b/src/cmd/go/list.go index e3b99bd0d..6b729aaec 100644 --- a/src/cmd/go/list.go +++ b/src/cmd/go/list.go @@ -49,13 +49,13 @@ which calls strings.Join. The struct being passed to the template is: CXXFiles []string // .cc, .cxx and .cpp source files HFiles []string // .h, .hh, .hpp and .hxx source files SFiles []string // .s source files - SysoFiles []string // .syso object files to add to archive SwigFiles []string // .swig files SwigCXXFiles []string // .swigcxx files + SysoFiles []string // .syso object files to add to archive // Cgo directives - CgoCPPFLAGS []string // cgo: flags for C preprocessor CgoCFLAGS []string // cgo: flags for C compiler + CgoCPPFLAGS []string // cgo: flags for C preprocessor CgoCXXFLAGS []string // cgo: flags for C++ compiler CgoLDFLAGS []string // cgo: flags for linker CgoPkgConfig []string // cgo: pkg-config names diff --git a/src/cmd/go/pkg.go b/src/cmd/go/pkg.go index b41ea4af4..32d56e96e 100644 --- a/src/cmd/go/pkg.go +++ b/src/cmd/go/pkg.go @@ -43,13 +43,13 @@ type Package struct { CXXFiles []string `json:",omitempty"` // .cc, .cpp and .cxx source files HFiles []string `json:",omitempty"` // .h, .hh, .hpp and .hxx source files SFiles []string `json:",omitempty"` // .s source files - SysoFiles []string `json:",omitempty"` // .syso system object files added to package SwigFiles []string `json:",omitempty"` // .swig files SwigCXXFiles []string `json:",omitempty"` // .swigcxx files + SysoFiles []string `json:",omitempty"` // .syso system object files added to package // Cgo directives - CgoCPPFLAGS []string `json:",omitempty"` // cgo: flags for C preprocessor CgoCFLAGS []string `json:",omitempty"` // cgo: flags for C compiler + CgoCPPFLAGS []string `json:",omitempty"` // cgo: flags for C preprocessor CgoCXXFLAGS []string `json:",omitempty"` // cgo: flags for C++ compiler CgoLDFLAGS []string `json:",omitempty"` // cgo: flags for linker CgoPkgConfig []string `json:",omitempty"` // cgo: pkg-config names @@ -104,11 +104,11 @@ func (p *Package) copyBuild(pp *build.Package) { p.CXXFiles = pp.CXXFiles p.HFiles = pp.HFiles p.SFiles = pp.SFiles - p.SysoFiles = pp.SysoFiles p.SwigFiles = pp.SwigFiles p.SwigCXXFiles = pp.SwigCXXFiles - p.CgoCPPFLAGS = pp.CgoCPPFLAGS + p.SysoFiles = pp.SysoFiles p.CgoCFLAGS = pp.CgoCFLAGS + p.CgoCPPFLAGS = pp.CgoCPPFLAGS p.CgoCXXFLAGS = pp.CgoCXXFLAGS p.CgoLDFLAGS = pp.CgoLDFLAGS p.CgoPkgConfig = pp.CgoPkgConfig |