diff --git a/CMakeLists.txt b/CMakeLists.txt
index 66015fe69..279156c93 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -46,6 +46,7 @@ message("Configuring zig version ${ZIG_VERSION}")
 set(ZIG_STATIC off CACHE BOOL "Attempt to build a static zig executable (not compatible with glibc)")
 set(ZIG_STATIC_LLVM off CACHE BOOL "Prefer linking against static LLVM libraries")
 set(ZIG_ENABLE_MEM_PROFILE off CACHE BOOL "Activate memory usage instrumentation")
+set(ZIG_PREFER_CLANG_CPP_DYLIB off CACHE BOOL "Try to link against -lclang-cpp")
 
 if(ZIG_STATIC)
     set(ZIG_STATIC_LLVM "on")
diff --git a/cmake/Findclang.cmake b/cmake/Findclang.cmake
index 28ecc5f55..c556455d1 100644
--- a/cmake/Findclang.cmake
+++ b/cmake/Findclang.cmake
@@ -17,7 +17,7 @@ find_path(CLANG_INCLUDE_DIRS NAMES clang/Frontend/ASTUnit.h
     /mingw64/include
 )
 
-if(NOT ZIG_STATIC_LLVM)
+if(ZIG_PREFER_CLANG_CPP_DYLIB)
   find_library(CLANG_CPP_DYLIB
     NAMES
       clang-cpp-10.0