Skip to content

Commit 912aa47

Browse files
authored
Update GitHub action LLVM version to 17.0.5 (#1373)
* Maybe update tools version * LLVM & Clang v17.0.5 now support source_location properly
1 parent bf4459b commit 912aa47

File tree

3 files changed

+6
-7
lines changed

3 files changed

+6
-7
lines changed

.github/actions/setup-llvm-msvc/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ inputs:
44
llvm-version:
55
description: 'LLVM version'
66
required: true
7-
default: '15.0.5'
7+
default: '17.0.5'
88
outputs:
99
llvm-path:
1010
description: "The path in which LLVM is installed to"

Directory.Build.Props

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,10 @@
2222
Optionally add /t:<project> to only build a given a solution project:
2323
2424
msbuild /m /p:Configuration=Debug,Platform=x64,Clang=1 cppwinrt.sln /t:cppwinrt
25+
26+
If you have deployed the LLVM toolset elsewhere, add its path to the configuration:
27+
28+
msbuild /m /p:Configuration=Debug,Platform=x64,Clang=1,LLVMToolsVersion=17.0.5,LLVMInstallDir=C:\llvm cppwinrt.sln
2529
-->
2630

2731
<PropertyGroup Condition="'$(Clang)'=='1'">

test/test_cpp20/custom_error.cpp

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,7 @@ namespace
3535
}
3636
}
3737

38-
#if defined(__clang__) && defined(_MSC_VER)
39-
// FIXME: Blocked on __cpp_consteval, see:
40-
// * https://github.com/microsoft/cppwinrt/pull/1203#issuecomment-1279764927
41-
// * https://github.com/llvm/llvm-project/issues/57094
42-
TEST_CASE("custom_error_logger", "[!shouldfail]")
43-
#elif defined(_LIBCPP_VERSION) && _LIBCPP_VERSION < 160000
38+
#if defined(_LIBCPP_VERSION) && _LIBCPP_VERSION < 170000
4439
// <source_location> not available in libc++ before LLVM 16
4540
TEST_CASE("custom_error_logger", "[!shouldfail]")
4641
#else

0 commit comments

Comments
 (0)