From 18688c3ed5c4fd030a3585a38d833731a7599b01 Mon Sep 17 00:00:00 2001 From: Jon Wiswall Date: Sat, 25 Nov 2023 15:46:16 -0800 Subject: [PATCH] LLVM & Clang v17.0.5 now support source_location properly --- Directory.Build.Props | 4 ++++ test/test_cpp20/custom_error.cpp | 7 +------ 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/Directory.Build.Props b/Directory.Build.Props index 38ad08350..95286d288 100644 --- a/Directory.Build.Props +++ b/Directory.Build.Props @@ -22,6 +22,10 @@ Optionally add /t: to only build a given a solution project: msbuild /m /p:Configuration=Debug,Platform=x64,Clang=1 cppwinrt.sln /t:cppwinrt + + If you have deployed the LLVM toolset elsewhere, add its path to the configuration: + + msbuild /m /p:Configuration=Debug,Platform=x64,Clang=1,LLVMToolsVersion=17.0.5,LLVMInstallDir=C:\llvm cppwinrt.sln --> diff --git a/test/test_cpp20/custom_error.cpp b/test/test_cpp20/custom_error.cpp index 34a0ea38f..97bfd8dc9 100644 --- a/test/test_cpp20/custom_error.cpp +++ b/test/test_cpp20/custom_error.cpp @@ -35,12 +35,7 @@ namespace } } -#if defined(__clang__) && defined(_MSC_VER) -// FIXME: Blocked on __cpp_consteval, see: -// * https://github.com/microsoft/cppwinrt/pull/1203#issuecomment-1279764927 -// * https://github.com/llvm/llvm-project/issues/57094 -TEST_CASE("custom_error_logger", "[!shouldfail]") -#elif defined(_LIBCPP_VERSION) && _LIBCPP_VERSION < 160000 +#if defined(_LIBCPP_VERSION) && _LIBCPP_VERSION < 170000 // not available in libc++ before LLVM 16 TEST_CASE("custom_error_logger", "[!shouldfail]") #else