diff --git a/llvm/CMakeLists.txt b/llvm/CMakeLists.txt
--- a/llvm/CMakeLists.txt
+++ b/llvm/CMakeLists.txt
@@ -81,6 +81,10 @@
 if( LLVM_ENABLE_PROJECTS STREQUAL "all" )
   set( LLVM_ENABLE_PROJECTS ${LLVM_ALL_PROJECTS})
 endif()
+if ("clang-tools-extra" IN_LIST LLVM_ENABLE_PROJECTS AND NOT "clang" IN_LIST LLVM_ENABLE_PROJECTS)
+  message(STATUS "clang-tools-extra is enabled, which depends on 'clang'. Automatically enabling 'clang'.")
+  list(APPEND LLVM_ENABLE_PROJECTS "clang")
+endif()
 if ("flang" IN_LIST LLVM_ENABLE_PROJECTS AND NOT "mlir" IN_LIST LLVM_ENABLE_PROJECTS)
   message(STATUS "Enabling MLIR as a dependency to flang")
   list(APPEND LLVM_ENABLE_PROJECTS "mlir")