diff --git a/localization/CMakeLists.txt b/localization/CMakeLists.txt
index 764b378f97b44..6a4ac7b0351fa 100644
--- a/localization/CMakeLists.txt
+++ b/localization/CMakeLists.txt
@@ -4,12 +4,13 @@ add_custom_command(TARGET diagnostic-database
   COMMAND
     ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR}/diagnostics/ ${CMAKE_BINARY_DIR}/share/swift/diagnostics/
   COMMAND
-    $<TARGET_FILE:swift-serialize-diagnostics>
+    "${SWIFT_NATIVE_SWIFT_TOOLS_PATH}/swift-serialize-diagnostics"
       --input-file-path ${CMAKE_BINARY_DIR}/share/swift/diagnostics/en.yaml
       --output-directory ${CMAKE_BINARY_DIR}/share/swift/diagnostics/
 )
 
 add_dependencies(swift-frontend diagnostic-database)
+add_dependencies(diagnostic-database swift-serialize-diagnostics)
 
 swift_install_in_component(
   DIRECTORY ${CMAKE_BINARY_DIR}/share/swift/diagnostics/