diff --git a/llvm/tools/llvm-cfi-verify/lib/CMakeLists.txt b/llvm/tools/llvm-cfi-verify/lib/CMakeLists.txt
--- a/llvm/tools/llvm-cfi-verify/lib/CMakeLists.txt
+++ b/llvm/tools/llvm-cfi-verify/lib/CMakeLists.txt
@@ -1,16 +1,4 @@
-add_library(LLVMCFIVerify
-  STATIC
-  FileAnalysis.cpp
-  FileAnalysis.h
-  GraphBuilder.cpp
-  GraphBuilder.h
-  )
-
-llvm_update_compile_flags(LLVMCFIVerify)
-if (LLVM_LINK_LLVM_DYLIB)
-  set(libs LLVM)
-else()
-  llvm_map_components_to_libnames(libs
+set(LLVM_LINK_COMPONENTS
     DebugInfoDWARF
     MC
     MCParser
@@ -18,6 +6,11 @@
     Support
     Symbolize
     )
-endif()
-target_link_libraries(LLVMCFIVerify ${libs})
-set_target_properties(LLVMCFIVerify PROPERTIES FOLDER "Libraries")
+
+add_llvm_library(LLVMCFIVerify
+  STATIC
+  FileAnalysis.cpp
+  FileAnalysis.h
+  GraphBuilder.cpp
+  GraphBuilder.h
+  )