diff --git a/doc/install-source.html b/doc/install-source.html
index c6dc3aed43e..f0a909263cf 100644
--- a/doc/install-source.html
+++ b/doc/install-source.html
@@ -119,11 +119,26 @@ The Go toolchain is written in Go. To build it, you need a Go compiler installed
The scripts that do the initial build of the tools look for a "go" command
in $PATH
, so as long as you have Go installed in your
system and configured in your $PATH
, you are ready to build Go
-from source.
+from source.
Or if you prefer you can set $GOROOT_BOOTSTRAP
to the
root of a Go installation to use to build the new Go toolchain;
$GOROOT_BOOTSTRAP/bin/go
should be the go command to use.
+There are four possible ways to obtain a bootstrap toolchain: +
+ ++These approaches are detailed below. +
+@@ -132,30 +147,6 @@ To use a binary release as a bootstrap toolchain, see packaged Go distribution.
-
-To build a bootstrap toolchain from source, use
-either the git branch release-branch.go1.4
or
-go1.4-bootstrap-20171003.tar.gz,
-which contains the Go 1.4 source code plus accumulated fixes
-to keep the tools running on newer operating systems.
-(Go 1.4 was the last distribution in which the toolchain was written in C.)
-After unpacking the Go 1.4 source, cd
to
-the src
subdirectory, set CGO_ENABLED=0
in
-the environment, and run make.bash
(or,
-on Windows, make.bat
).
-
-Once the Go 1.4 source has been unpacked into your GOROOT_BOOTSTRAP directory,
-you must keep this git clone instance checked out to branch
-release-branch.go1.4
. Specifically, do not attempt to reuse
-this git clone in the later step named "Fetch the repository." The go1.4
-bootstrap toolchain must be able to properly traverse the go1.4 sources
-that it assumes are present under this repository root.
-
@@ -194,6 +185,36 @@ $ sudo update-alternatives --set go /usr/bin/go-5 $ GOROOT_BOOTSTRAP=/usr ./make.bash +
+To build a bootstrap toolchain from C source code, use
+either the git branch release-branch.go1.4
or
+go1.4-bootstrap-20171003.tar.gz,
+which contains the Go 1.4 source code plus accumulated fixes
+to keep the tools running on newer operating systems.
+(Go 1.4 was the last distribution in which the toolchain was written in C.)
+After unpacking the Go 1.4 source, cd
to
+the src
subdirectory, set CGO_ENABLED=0
in
+the environment, and run make.bash
(or,
+on Windows, make.bat
).
+
+Once the Go 1.4 source has been unpacked into your GOROOT_BOOTSTRAP directory,
+you must keep this git clone instance checked out to branch
+release-branch.go1.4
. Specifically, do not attempt to reuse
+this git clone in the later step named "Fetch the repository." The go1.4
+bootstrap toolchain must be able to properly traverse the go1.4 sources
+that it assumes are present under this repository root.
+
+Note that Go 1.4 does not run on all systems that later versions of Go do. +In particular, Go 1.4 does not support current versions of macOS. +On such systems, the bootstrap toolchain must be obtained using one of the other methods. +
+