diff --git a/llvm/lib/CMakeLists.txt b/llvm/lib/CMakeLists.txt
index e2ec351ed5f6f..96873244f3ee5 100644
--- a/llvm/lib/CMakeLists.txt
+++ b/llvm/lib/CMakeLists.txt
@@ -41,9 +41,9 @@ add_subdirectory(LineEditor)
 add_subdirectory(ProfileData)
 add_subdirectory(Passes)
 add_subdirectory(SYCLLowerIR)
-add_subdirectory(SYCLNativeCPUUtils)
 add_subdirectory(SYCLPostLink)
 add_subdirectory(TargetParser)
+add_subdirectory(SYCLNativeCPUUtils)
 add_subdirectory(TextAPI)
 add_subdirectory(Telemetry)
 add_subdirectory(ToolDrivers)
diff --git a/llvm/lib/SYCLNativeCPUUtils/CMakeLists.txt b/llvm/lib/SYCLNativeCPUUtils/CMakeLists.txt
index 89eb007ad3403..cb3e3fff77814 100644
--- a/llvm/lib/SYCLNativeCPUUtils/CMakeLists.txt
+++ b/llvm/lib/SYCLNativeCPUUtils/CMakeLists.txt
@@ -7,7 +7,7 @@ if(NOT "native_cpu" IN_LIST SYCL_ENABLE_BACKENDS)
 endif()
 
 if(NATIVECPU_USE_OCK)
-  add_subdirectory(compiler_passes EXCLUDE_FROM_ALL)
+  add_subdirectory(compiler_passes)
   set(OCK_LIBS NativeCPUPipeline NativeCPUVecz)
 endif()
 
diff --git a/llvm/lib/SYCLNativeCPUUtils/compiler_passes/vecz/tools/CMakeLists.txt b/llvm/lib/SYCLNativeCPUUtils/compiler_passes/vecz/tools/CMakeLists.txt
index 921204b382aa0..5a51ce168d8a1 100644
--- a/llvm/lib/SYCLNativeCPUUtils/compiler_passes/vecz/tools/CMakeLists.txt
+++ b/llvm/lib/SYCLNativeCPUUtils/compiler_passes/vecz/tools/CMakeLists.txt
@@ -1,7 +1,7 @@
 llvm_map_components_to_libnames(llvm_libs all ${LLVM_TARGETS_TO_BUILD})
 list(REMOVE_ITEM llvm_libs LTO OptRemarks)
 
-add_llvm_tool(veczc
+add_llvm_utility(veczc
  ${CMAKE_CURRENT_SOURCE_DIR}/source/veczc.cpp
 )
 target_compile_options(veczc PRIVATE ${VECZ_COMPILE_OPTIONS})