Index: www/build.html
===================================================================
--- www/build.html
+++ www/build.html
@@ -116,14 +116,14 @@
                 the PYTHONHOME environment variable if it is specified).
               </li>
               <li>
-                <b>LLDB_TEST_COMPILER</b>: The test suite needs to be able to find a copy of clang.exe that it can use to compile
-                inferior programs.  Note that MSVC is not supported here, it <strong>must</strong> be a path to a clang executable.
-                Note that using a release clang.exe is strongly recommended here, as it will make the test suite run much faster.
+                <b>LLDB_TEST_C_COMPILER</b> or <b>LLDB_TEST_CXX_COMPILER</b>: The test suite needs to be able to find a copy of clang.exe
+                that it can use to compile inferior programs.  Note that MSVC is not supported here, it <strong>must</strong> be a path to a
+                clang executable.  Note that using a release clang.exe is strongly recommended here, as it will make the test suite run much faster.
                 This can be a path to any recent clang.exe, including one you built yourself.
               </li>
             </ul>
             Sample command line:<br/>
-            <code>cmake -G Ninja -DLLDB_TEST_DEBUG_TEST_CRASHES=1 -DPYTHON_HOME=C:\Python35 -DLLDB_TEST_COMPILER=d:\src\llvmbuild\ninja_release\bin\clang.exe ..\..\llvm</code>
+            <code>cmake -G Ninja -DLLDB_TEST_DEBUG_TEST_CRASHES=1 -DPYTHON_HOME=C:\Python35 -DLLDB_TEST_C_COMPILER=d:\src\llvmbuild\ninja_release\bin\clang.exe ..\..\llvm</code>
             <h2>Working with both Ninja and MSVC</h2>
             <p>
               Compiling with <code>ninja</code> is both faster and simpler than compiling with MSVC, but chances are you still want
Index: www/test.html
===================================================================
--- www/test.html
+++ www/test.html
@@ -39,8 +39,8 @@
               The easiest way to run the LLDB test suite is to use the <tt>check-lldb</tt> build
               target. By default, the <tt>check-lldb</tt> target builds the test programs with
               the same compiler that was used to build LLDB. To build the tests with a different
-              compiler, you can set the <strong>LLDB_TEST_COMPILER</strong> CMake variable. It is possible to
-              customize the architecture of the test binaries and compiler used by appending -A
+              compiler, you can set the <strong>LLDB_TEST_C_COMPILER</strong> or the <strong>LLDB_TEST_CXX_COMPILER</strong> CMake variables.
+              It is possible to customize the architecture of the test binaries and compiler used by appending -A
               and -C options respectively to the CMake variable <strong>LLDB_TEST_USER_ARGS</strong>. For
               example, to test LLDB against 32-bit binaries
               built with a custom version of clang, do: