Update installation instructions with Clang on Windows

1 files changed, 22 insertions, 16 deletions

diff --git a/BOOTSTRAP-WINDOWS.cli b/BOOTSTRAP-WINDOWS.cli
index c99ffc7..b013d3b 100644
--- a/BOOTSTRAP-WINDOWS.cli
+++ b/BOOTSTRAP-WINDOWS.cli
@@ -3,11 +3,12 @@
 // license   : MIT; see accompanying LICENSE file
 
 "
-The following instructions are for bootstrapping \c{build2} with either MSVC
-or MinGW using the Windows command prompt. If you are using any kind of UNIX
-emulation layer (for example, WSL, MSYS, or Cygwin) and already have a UNIX
-shell with standard utilities, then you most likely should follow
-\l{#bootstrap-unix Bootstrapping on UNIX} instead.
+The following instructions are for bootstrapping \c{build2} from the Windows
+command prompt with either MSVC, Clang (targeting the MSVC runtime), or
+MinGW. If you are using any kind of UNIX emulation layer (for example, WSL,
+MSYS, or Cygwin) and already have a UNIX shell with standard utilities, then
+you most likely should follow \l{#bootstrap-unix Bootstrapping on UNIX}
+instead.
 
 \N|Note that if you continue with these instructions but you already have your
 own installation of MSYS and/or MinGW, then make sure that their paths are not
@@ -20,11 +21,12 @@ The \c{build2} toolchain on Windows requires a set of extra utilities
 Normally, the \c{build2} toolchain itself is installed into the same directory
 as the utilities in order to produce the  combined installation.
 
-To build on Windows you will need either MSVC 14 Update 3 or later or MinGW
-GCC 4.9 or later. If you don't already have a suitable C++ compiler, then you
-can use the \c{build2-mingw} package which provides a minimal MinGW-W64 GCC
-distribution (see the \c{README} file inside for details). If used, then it
-should be unpacked into the same directory as \c{build2-baseutils}.
+To build on Windows you will need either MSVC 14 Update 3 or later, Clang 8 or
+later (either bundled with MSVC or installed separately), or MinGW GCC 4.9 or
+later. If you don't already have a suitable C++ compiler, then you can use the
+\c{build2-mingw} package which provides a minimal MinGW-W64 GCC distribution
+(see the \c{README} file inside for details). If used, then it should be
+unpacked into the same directory as \c{build2-baseutils}.
 
 \N|If using your own MinGW GCC installation, make sure it is configured with
 the \c{posix} threading model (this is currently the only configuration that
@@ -35,16 +37,17 @@ provided and they \b{must} match the width of the \c{build2} toolchain. Note
 also that the 64-bit \c{build2} toolchain can be used to build 32-bit
 applications without any restrictions.|
 
-To bootstrap on Windows with either MSVC or MinGW start with the following
-common steps:
+To bootstrap on Windows with either MSVC, Clang, or MinGW start with the
+following common steps:
 
 \dl|
 
 \li|\b{1. Open Command Prompt}\n
 
-Start the standard Windows Command Prompt. If you plan to build with MSVC,
-then you may go ahead and start the Visual Studio \"x64 Native Tools Command
-Prompt\" (or wait for MSVC-specific instructions).|
+Start the standard Windows Command Prompt. If you plan to build with MSVC or
+Clang bundled with MSVC, then you may go ahead and start the Visual Studio
+\"x64 Native Tools Command Prompt\" (or wait for MSVC/Clang-specific
+instructions).|
 
 \li|\n\b{2. Create Build Directory}\n
 
@@ -98,7 +101,7 @@ Set the \c{PATH} environment variable and verify that the utilities are found
 and work:
 
 \
-> set PATH=C:\build2\bin;%PATH%
+> set \"PATH=C:\build2\bin;%PATH%\"
 > where tar
 > tar --version
 \
@@ -141,6 +144,9 @@ directory:
 If building with MSVC, continue with \l{#bootstrap-windows-msvc Bootstrapping
 on Windows with MSVC}.
 
+If building with Clang, continue with \l{#bootstrap-windows-clang Bootstrapping
+on Windows with Clang}.
+
 If building with MinGW, continue with \l{#bootstrap-windows-mingw
 Bootstrapping on Windows with MinGW}.
 "