diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5cb4f45..713d7a4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,5 +1,7 @@
-project(yak C ASM)
 cmake_minimum_required(VERSION 3.24.0)
+project(yak C ASM)
+
+string(REGEX MATCH "^[0-9]+" CLANG_VERSION_MAJOR ${CMAKE_C_COMPILER_VERSION})
 
 include(FetchContent)
 
diff --git a/yak-kernel/CMakeLists.txt b/yak-kernel/CMakeLists.txt
index 70c3a0f..791b16f 100644
--- a/yak-kernel/CMakeLists.txt
+++ b/yak-kernel/CMakeLists.txt
@@ -15,7 +15,7 @@ option(USE_DEBUG "Enable debug code" ON)
 option(USE_LIMINE "Enable support for the limine boot protocol" ON)
 
 # Find builtins
-list(APPEND BUILTINS_SEARCH /usr/lib/clang/15/lib/linux /usr/lib/clang/${CMAKE_C_COMPILER_VERSION}/lib/linux /usr/lib/clang/15.*.*/lib/linux)
+list(APPEND BUILTINS_SEARCH /usr/lib/clang/${CLANG_VERSION_MAJOR}/lib/linux /usr/lib/clang/${CMAKE_C_COMPILER_VERSION}/lib/linux)
 find_library(BUILTINS_LIB
         libclang_rt.builtins-x86_64.a
         PATHS ${BUILTINS_SEARCH})