diff --git a/bolt/tools/CMakeLists.txt b/bolt/tools/CMakeLists.txt
--- a/bolt/tools/CMakeLists.txt
+++ b/bolt/tools/CMakeLists.txt
@@ -8,8 +8,8 @@
   llvm_add_tool(BOLT ${ARGV})
 endmacro()
 
-macro(add_bolt_tool_symlink name)
-  llvm_add_tool_symlink(BOLT ${ARGV})
+macro(add_bolt_tool_symlink name dest)
+  llvm_add_tool_symlink(BOLT ${name} ${dest})
 endmacro()
 
 add_subdirectory(driver)
diff --git a/bolt/tools/driver/CMakeLists.txt b/bolt/tools/driver/CMakeLists.txt
--- a/bolt/tools/driver/CMakeLists.txt
+++ b/bolt/tools/driver/CMakeLists.txt
@@ -37,15 +37,19 @@
   )
 
 add_custom_target(bolt DEPENDS ${BOLT_DEPENDS})
-install(PROGRAMS
-  ${CMAKE_BINARY_DIR}/bin/llvm-bolt
-  ${CMAKE_BINARY_DIR}/bin/perf2bolt
-  ${CMAKE_BINARY_DIR}/bin/llvm-boltdiff
-  DESTINATION ${CMAKE_INSTALL_BINDIR}
-  COMPONENT bolt
-  )
-add_llvm_install_targets(install-bolt DEPENDS bolt COMPONENT bolt)
 set_target_properties(bolt PROPERTIES FOLDER "BOLT")
+
+add_custom_target(install-bolt)
+add_custom_target(install-bolt-stripped)
+foreach(target ${BOLT_DEPENDS})
+  if(TARGET install-${target})
+    add_custom_target(install-bolt install-${target})
+  endif()
+  if(TARGET install-${target}-stripped)
+    add_custom_target(install-bolt-stripped install-${target})
+  endif()
+endforeach()
 set_target_properties(install-bolt PROPERTIES FOLDER "BOLT")
+set_target_properties(install-bolt-stripped PROPERTIES FOLDER "BOLT")
 
 include_directories( ${BOLT_SOURCE_DIR}/lib )
diff --git a/bolt/tools/merge-fdata/CMakeLists.txt b/bolt/tools/merge-fdata/CMakeLists.txt
--- a/bolt/tools/merge-fdata/CMakeLists.txt
+++ b/bolt/tools/merge-fdata/CMakeLists.txt
@@ -11,11 +11,6 @@
 set_target_properties(merge-fdata PROPERTIES FOLDER "BOLT")
 
 add_dependencies(bolt merge-fdata)
-install(PROGRAMS
-  ${CMAKE_BINARY_DIR}/bin/merge-fdata
-  DESTINATION ${CMAKE_INSTALL_BINDIR}
-  COMPONENT bolt
-  )
 
 # Emit relocations for BOLT meta test (bolt/test/runtime/meta-merge-fdata.test)
 if (BOLT_INCLUDE_TESTS AND UNIX AND NOT APPLE)