diff --git a/clang/tools/clang-offload-bundler/CMakeLists.txt b/clang/tools/clang-offload-bundler/CMakeLists.txt
index 4ef099493364a..d1bd248e3ef45 100644
--- a/clang/tools/clang-offload-bundler/CMakeLists.txt
+++ b/clang/tools/clang-offload-bundler/CMakeLists.txt
@@ -17,6 +17,11 @@ set(CLANG_OFFLOAD_BUNDLER_LIB_DEPS
   
 add_dependencies(clang clang-offload-bundler)
 
+# A standalone clang build uses a pre-installed llvm-objcopy
+if (NOT CLANG_BUILT_STANDALONE)
+  add_dependencies(clang-offload-bundler llvm-objcopy)
+endif()
+
 clang_target_link_libraries(clang-offload-bundler
   PRIVATE
   ${CLANG_OFFLOAD_BUNDLER_LIB_DEPS}