https://bugs.gentoo.org/902101
--- a/cmake/modules/FindClang.cmake
+++ b/cmake/modules/FindClang.cmake
@@ -97,6 +97,8 @@
   # dito for git
   string(REPLACE "git" "" CLANG_VERSION_CLEAN "${CLANG_VERSION}")
 
+  string(REGEX REPLACE "([.]0)+$" "" CLANG_VERSION_STRIPPED "${CLANG_VERSION}")
+  string(REGEX REPLACE "([.]0)+$" "" CLANG_VERSION_CLEAN_STRIPPED "${CLANG_VERSION_CLEAN}")
   find_path(CLANG_BUILTIN_DIR
             # cpuid.h because it is defined in ClangSupport constructor as valid clang builtin dir indicator
             NAMES "cpuid.h"
@@ -106,6 +108,10 @@
                           "../../../clang/${CLANG_VERSION}/include"
                           "clang/${CLANG_VERSION_CLEAN}/include"
                           "../../../clang/${CLANG_VERSION_CLEAN}/include"
+                          "clang/${CLANG_VERSION_STRIPPED}/include"
+                          "../../../clang/${CLANG_VERSION_STRIPPED}/include"
+                          "clang/${CLANG_VERSION_CLEAN_STRIPPED}/include"
+                          "../../../clang/${CLANG_VERSION_CLEAN_STRIPPED}/include"
             NO_DEFAULT_PATH
   )