summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRuss Cox <rsc@golang.org>2014-04-16 22:30:10 -0400
committerRuss Cox <rsc@golang.org>2014-04-16 22:30:10 -0400
commit1cf1c76235b80ac7c85214e8c37ebe006c30f623 (patch)
treeea2c3944847a87239a1fff1c85b28fe46620b444
parent14f4e6ac42f973b414515c35af47b74ecd63f45c (diff)
downloadgo-1cf1c76235b80ac7c85214e8c37ebe006c30f623.tar.gz
cmd/go: reapply doc change from CL 60590044.
https://codereview.appspot.com/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://codereview.appspot.com/88760043
-rw-r--r--src/cmd/go/doc.go4
-rw-r--r--src/cmd/go/help.go4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/cmd/go/doc.go b/src/cmd/go/doc.go
index 664bc83bd..65b68d93b 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 faa4d9af8..0142deee9 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.
`,