From 9cb5e46ba0a4ec447d79a730a0e1cb6adbe9d03f Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Tue, 19 Jul 2022 08:27:20 +0200 Subject: Add support for Clang targeting MSVC 17 in bootstrap and environment batch files --- etc/bootstrap/bbot-bootstrap-clang.bat | 4 +++- etc/environments/default-clang.bat | 7 +++++-- 2 files changed, 8 insertions(+), 3 deletions(-) (limited to 'etc') diff --git a/etc/bootstrap/bbot-bootstrap-clang.bat b/etc/bootstrap/bbot-bootstrap-clang.bat index 3f4e35d..99124e9 100644 --- a/etc/bootstrap/bbot-bootstrap-clang.bat +++ b/etc/bootstrap/bbot-bootstrap-clang.bat @@ -52,7 +52,9 @@ rem See also adding MSVC-bundled Clang to PATH below. set "MSVC=" -set "MSVC=C:\Program Files (x86)\Microsoft Visual Studio\2019\Community" +rem set "MSVC=C:\Program Files (x86)\Microsoft Visual Studio\2019\Community" +set "MSVC=C:\Program Files\Microsoft Visual Studio\2022\Community" + set "VCVARS=VC\Auxiliary\Build\vcvars64.bat" set "CXX=clang++" diff --git a/etc/environments/default-clang.bat b/etc/environments/default-clang.bat index d1faca7..3868889 100644 --- a/etc/environments/default-clang.bat +++ b/etc/environments/default-clang.bat @@ -24,8 +24,11 @@ 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=C:\Program Files (x86)\Microsoft Visual Studio\2019\Community" +rem set "MSVC_VER=14.2" + +set "MSVC=C:\Program Files\Microsoft Visual Studio\2022\Community" +set "MSVC_VER=14.3" set "VCVARS32=VC\Auxiliary\Build\vcvarsamd64_x86.bat" set "VCVARS64=VC\Auxiliary\Build\vcvars64.bat" -- cgit v1.1