From: Shenghou Ma <minux.ma@gmail.com>
Date: Fri, 21 Sep 2012 19:54:41 +0000 (+1000)
Subject: [release-branch.go1] doc/install: we only need command line tools for Xcode on OS X
X-Git-Tag: go1.0.3~83
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=e31957cddbcad8ff7d6659323f15ea708d919ff0;p=gostls13.git

[release-branch.go1] doc/install: we only need command line tools for Xcode on OS X

««« backport 975bfb6bbac4
doc/install: we only need command line tools for Xcode on OS X
     Fixes #3973.

R=golang-dev, r
CC=golang-dev
https://golang.org/cl/6464078

»»»
---

diff --git a/doc/install-source.html b/doc/install-source.html
index 442cc5035c..04b6deb9ca 100644
--- a/doc/install-source.html
+++ b/doc/install-source.html
@@ -86,8 +86,14 @@ To build it, you need a C compiler installed.
 </p>
 
 <p>
-On OS X, a C compiler can be installed as part of
-<a href="http://developer.apple.com/Xcode/">Xcode</a>. 
+On OS X, a C compiler is bundled in the command line tools for
+<a href="http://developer.apple.com/Xcode/">Xcode</a>,
+and you don't need to install the whole Xcode to compile Go.
+If you have already installed Xcode 4.3+, you can install command
+line tools from the Components tab of the Downloads preferences panel.
+To verify you have a working compiler, just invoke <code>gcc</code>
+in a freshly created Terminal window, unless you see the
+"<code>gcc: command not found</code>" error, you are ready to go.
 </p>
 
 <p>
diff --git a/doc/install.html b/doc/install.html
index bc9b3f4654..66062af28d 100644
--- a/doc/install.html
+++ b/doc/install.html
@@ -42,12 +42,17 @@ proceeding. If your OS or architecture is not on the list, it's possible that
 <tr><td colspan="3"><hr></td></tr>
 <tr><td>FreeBSD 7 or later</td> <td>amd64, 386</td> <td>Debian GNU/kFreeBSD not supported</td></tr>
 <tr><td>Linux 2.6.23 or later with glibc</td> <td>amd64, 386, arm</td> <td>CentOS/RHEL 5.x not supported; no binary distribution for ARM yet</td></tr>
-<tr><td>Mac OS X 10.6/10.7</td> <td>amd64, 386</td> <td>use the gcc<sup>&#8224;</sup> that comes with Xcode</td></tr>
+<tr><td>Mac OS X 10.6/10.7</td> <td>amd64, 386</td> <td>use the gcc<sup>&#8224;</sup> that comes with Xcode<sup>&#8225;</sup></td></tr>
 <tr><td>Windows 2000 or later</td> <td>amd64, 386</td> <td>use mingw gcc<sup>&#8224;</sup>; cygwin or msys is not needed</td></tr>
 </table>
 
 <p>
-<sup>&#8224;</sup><code>gcc</code> is required only if you plan to use <a href="/cmd/cgo">cgo</a>.
+<sup>&#8224;</sup><code>gcc</code> is required only if you plan to use
+<a href="/cmd/cgo">cgo</a>.<br/>
+<sup>&#8225;</sup>You only need to install the command line tools for
+<a href="http://developer.apple.com/Xcode/">Xcode</a>. If you have already
+installed Xcode 4.3+, you can install it from the Components tab of the
+Downloads preferences panel.
 </p>
 
 <h2 id="download">Download the Go tools</h2>