3 files changed, 13 insertions, 4 deletions
diff --git a/etc/bootstrap/bbot-bootstrap-clang.bat b/etc/bootstrap/bbot-bootstrap-clang.bat
index 3fc7e67..c2be121 100644
--- a/etc/bootstrap/bbot-bootstrap-clang.bat
+++ b/etc/bootstrap/bbot-bootstrap-clang.bat
@@ -9,9 +9,10 @@ setlocal EnableExtensions EnableDelayedExpansion
 rem If the MSVC variable is set, then set up the environment via the MSVC
 rem command prompt rather than letting Clang find some default (note that
 rem in the latter case, clang++ should be in PATH).
+rem
+rem See also adding MSVC-bundled Clang to PATH below.
 
-rem set "MSVC="
-rem set "VCVARS="
+set "MSVC="
 
 set "MSVC=C:\Program Files (x86)\Microsoft Visual Studio\2019\Community"
 set "VCVARS=VC\Auxiliary\Build\vcvars64.bat"
@@ -43,6 +44,12 @@ if not "_%MSVC%_" == "__" (
   if errorlevel 1 goto error
 )
 
+rem Use MSVC-bundled Clang.
+rem
+if not "_%VCINSTALLDIR%_" == "__" (
+  set "PATH=%VCINSTALLDIR%Tools\Llvm\bin;%PATH%"
+)
+
 rem Use bootstrap tools.
 rem
 set "PATH=%BOOTSTRAP%\bin;%PATH%"
diff --git a/etc/environments/default-clang.bat b/etc/environments/default-clang.bat
index 5c03fbe..78109a9 100644
--- a/etc/environments/default-clang.bat
+++ b/etc/environments/default-clang.bat
@@ -20,14 +20,14 @@ rem (note that in the latter case, clang++ should be in PATH).
 rem
 rem Note also that MSVC_VER must always be set.
 
+set "MSVC="
+
 rem set "MSVC=C:\Program Files (x86)\Microsoft Visual Studio\2017\Community"
 rem set "MSVC_VER=14.1"
 
 set "MSVC=C:\Program Files (x86)\Microsoft Visual Studio\2019\Community"
 set "MSVC_VER=14.2"
 
-rem set "MSVC="
-
 set "VCVARS32=VC\Auxiliary\Build\vcvarsamd64_x86.bat"
 set "VCVARS64=VC\Auxiliary\Build\vcvars64.bat"
 
diff --git a/etc/environments/default-msvc.bat b/etc/environments/default-msvc.bat
index 381dc73..86f4f76 100644
--- a/etc/environments/default-msvc.bat
+++ b/etc/environments/default-msvc.bat
@@ -13,6 +13,8 @@ rem the MSVC command prompt rather than letting build2 find the default.
 rem
 rem Note also that MSVC_VER must always be set.
 
+set "MSVC="
+
 rem set "MSVC=C:\Program Files (x86)\Microsoft Visual Studio\2017\Community"
 rem set "MSVC_VER=14.1"