diff --git a/buildbot/configure.py b/buildbot/configure.py
index 5bddddec67a06..93af20add89b9 100644
--- a/buildbot/configure.py
+++ b/buildbot/configure.py
@@ -21,8 +21,7 @@ def do_configure(args, passthrough_args):
     if not os.path.isdir(abs_obj_dir):
         os.makedirs(abs_obj_dir)
 
-    llvm_external_projects = "sycl;llvm-spirv;opencl;xpti;xptifw;compiler-rt"
-
+    llvm_external_projects = "sycl;llvm-spirv;opencl;xpti;xptifw"
     # libdevice build requires a working SYCL toolchain, which is not the case
     # with macOS target right now.
     if sys.platform != "darwin":
@@ -67,6 +66,9 @@ def do_configure(args, passthrough_args):
     llvm_enable_zstd = "ON"
     spirv_enable_dis = "OFF"
 
+    llvm_external_projects+=";compiler-rt"
+    llvm_enable_runtimes ="compiler-rt"
+
     if sys.platform != "darwin":
         # For more info on the enablement of level_zero_v2 refer to this document:
         # https://github.com/intel/llvm/blob/sycl/unified-runtime/source/adapters/level_zero/v2/README.md
@@ -147,7 +149,9 @@ def do_configure(args, passthrough_args):
             print("#############################################")
 
         # For clang-format, clang-tidy and code coverage
-        llvm_enable_projects += ";clang-tools-extra;compiler-rt"
+        llvm_enable_projects += ";clang-tools-extra"
+        if "compiler-rt" not in llvm_enable_runtimes:
+            llvm_enable_runtimes += ";compiler-rt"
         if sys.platform != "darwin":
             # libclc is required for CI validation
             libclc_enabled = True
@@ -195,6 +199,7 @@ def do_configure(args, passthrough_args):
         "-DLLVM_EXTERNAL_LIBDEVICE_SOURCE_DIR={}".format(libdevice_dir),
         "-DLLVM_EXTERNAL_SYCL_JIT_SOURCE_DIR={}".format(jit_dir),
         "-DLLVM_ENABLE_PROJECTS={}".format(llvm_enable_projects),
+        "-DLLVM_ENABLE_RUNTIMES={}".format(llvm_enable_runtimes),
         "-DSYCL_BUILD_PI_HIP_PLATFORM={}".format(sycl_build_pi_hip_platform),
         "-DLLVM_BUILD_TOOLS=ON",
         "-DLLVM_ENABLE_ZSTD={}".format(llvm_enable_zstd),
diff --git a/sycl/CMakeLists.txt b/sycl/CMakeLists.txt
index 3586a8d725ab2..4abdcfc93cf9b 100644
--- a/sycl/CMakeLists.txt
+++ b/sycl/CMakeLists.txt
@@ -612,8 +612,8 @@ add_custom_target(install-sycl-test-utilities
     install-llvm-size
     install-llvm-cov
     install-llvm-profdata
-    install-compiler-rt
   # This is required to perform the DeviceConfigFile consistency test, see
   # sycl/test-e2e/Basic/device_config_file_consistency.cpp.
   COMMAND ${CMAKE_COMMAND} --install ${CMAKE_BINARY_DIR} --component DeviceConfigFile
+  COMMAND ${CMAKE_COMMAND} --install ${CMAKE_BINARY_DIR} --component compiler-rt
 )