diff options
| author | Russ Cox <rsc@golang.org> | 2014-04-16 22:30:10 -0400 |
|---|---|---|
| committer | Russ Cox <rsc@golang.org> | 2014-04-16 22:30:10 -0400 |
| commit | 6f2d91a094c78165646ddaa0c139191f6943c7d2 (patch) | |
| tree | 0fecc4d2ababcd9332d7f6458135d43fbe274590 | |
| parent | fce4f0484c3eccf128b114c27d8eace075b935f9 (diff) | |
| download | go-6f2d91a094c78165646ddaa0c139191f6943c7d2.tar.gz go-6f2d91a094c78165646ddaa0c139191f6943c7d2.zip | |
cmd/go: reapply doc change from CL 60590044.
https://golang.org/cl/60590044 edited
doc.go without editing the file it is generated from.
The edit was lost at the next mkdoc.sh.
Make the change in help.go and rerun mkdoc.sh.
Pointed out in the review of CL 68580043.
TBR=iant
CC=golang-codereviews
https://golang.org/cl/88760043
| -rw-r--r-- | src/cmd/go/doc.go | 4 | ||||
| -rw-r--r-- | src/cmd/go/help.go | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/cmd/go/doc.go b/src/cmd/go/doc.go index 664bc83bde..65b68d93bc 100644 --- a/src/cmd/go/doc.go +++ b/src/cmd/go/doc.go @@ -511,8 +511,8 @@ http://swig.org/. When running go build, any file with a .swig extension will be passed to SWIG. Any file with a .swigcxx extension will be passed to SWIG with the -c++ option. -When either cgo or SWIG is used, go build will pass any .c, .s, or .S -files to the C compiler, and any .cc, .cpp, .cxx files to the C++ +When either cgo or SWIG is used, go build will pass any .c, .m, .s, +or .S files to the C compiler, and any .cc, .cpp, .cxx files to the C++ compiler. The CC or CXX environment variables may be set to determine the C or C++ compiler, respectively, to use. diff --git a/src/cmd/go/help.go b/src/cmd/go/help.go index faa4d9af82..0142deee9f 100644 --- a/src/cmd/go/help.go +++ b/src/cmd/go/help.go @@ -19,8 +19,8 @@ http://swig.org/. When running go build, any file with a .swig extension will be passed to SWIG. Any file with a .swigcxx extension will be passed to SWIG with the -c++ option. -When either cgo or SWIG is used, go build will pass any .c, .s, or .S -files to the C compiler, and any .cc, .cpp, .cxx files to the C++ +When either cgo or SWIG is used, go build will pass any .c, .m, .s, +or .S files to the C compiler, and any .cc, .cpp, .cxx files to the C++ compiler. The CC or CXX environment variables may be set to determine the C or C++ compiler, respectively, to use. `, |