diff --git a/llvm/utils/llvm-locstats/CMakeLists.txt b/llvm/utils/llvm-locstats/CMakeLists.txt
--- a/llvm/utils/llvm-locstats/CMakeLists.txt
+++ b/llvm/utils/llvm-locstats/CMakeLists.txt
@@ -2,11 +2,15 @@
   add_custom_command(
     OUTPUT ${LLVM_TOOLS_BINARY_DIR}/llvm-locstats
     DEPENDS ${LLVM_MAIN_SRC_DIR}/utils/llvm-locstats/llvm-locstats.py
+    DEPENDS llvm-dwarfdump
     COMMAND ${CMAKE_COMMAND} -E copy ${LLVM_MAIN_SRC_DIR}/utils/llvm-locstats/llvm-locstats.py ${LLVM_TOOLS_BINARY_DIR}/llvm-locstats
     COMMENT "Copying llvm-locstats into ${LLVM_TOOLS_BINARY_DIR}"
     )
   add_custom_target(llvm-locstats ALL
     DEPENDS ${LLVM_TOOLS_BINARY_DIR}/llvm-locstats
     )
+  if (NOT LLVM_BUILD_TOOLS)
+    set_target_properties(llvm-locstats PROPERTIES EXCLUDE_FROM_ALL ON)
+  endif()
   set_target_properties(llvm-locstats PROPERTIES FOLDER "Tools")
 endif()