diff --git a/llvm/utils/gn/secondary/llvm/tools/llvm-dwp/BUILD.gn b/llvm/utils/gn/secondary/llvm/tools/llvm-dwp/BUILD.gn
index f618fc0edeb07..01f8d0f134dd2 100644
--- a/llvm/utils/gn/secondary/llvm/tools/llvm-dwp/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/tools/llvm-dwp/BUILD.gn
@@ -1,4 +1,5 @@
 import("//llvm/tools/binutils_symlinks.gni")
+import("//llvm/utils/gn/build/driver_executable.gni")
 import("//llvm/utils/gn/build/symlink_or_copy.gni")
 import("//llvm/utils/TableGen/tablegen.gni")
 
@@ -23,7 +24,7 @@ group("symlinks") {
   }
 }
 
-executable("llvm-dwp") {
+driver_executable("llvm-dwp") {
   deps = [
     ":Opts",
     "//llvm/lib/DWP",
diff --git a/llvm/utils/gn/secondary/llvm/tools/llvm-libtool-darwin/BUILD.gn b/llvm/utils/gn/secondary/llvm/tools/llvm-libtool-darwin/BUILD.gn
index 88898480be009..c974cae267371 100644
--- a/llvm/utils/gn/secondary/llvm/tools/llvm-libtool-darwin/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/tools/llvm-libtool-darwin/BUILD.gn
@@ -1,4 +1,5 @@
 import("//llvm/tools/cctools_symlinks.gni")
+import("//llvm/utils/gn/build/driver_executable.gni")
 import("//llvm/utils/gn/build/symlink_or_copy.gni")
 import("//llvm/utils/TableGen/tablegen.gni")
 
@@ -24,7 +25,7 @@ group("symlinks") {
   }
 }
 
-executable("llvm-libtool-darwin") {
+driver_executable("llvm-libtool-darwin") {
   deps = [
     ":Opts",
     "//llvm/lib/Object",
diff --git a/llvm/utils/gn/secondary/llvm/tools/sancov/BUILD.gn b/llvm/utils/gn/secondary/llvm/tools/sancov/BUILD.gn
index fedc86baa3f62..ff0fd700c911a 100644
--- a/llvm/utils/gn/secondary/llvm/tools/sancov/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/tools/sancov/BUILD.gn
@@ -1,3 +1,4 @@
+import("//llvm/utils/gn/build/driver_executable.gni")
 import("//llvm/utils/TableGen/tablegen.gni")
 
 tablegen("Opts") {
@@ -5,7 +6,7 @@ tablegen("Opts") {
   args = [ "-gen-opt-parser-defs" ]
 }
 
-executable("sancov") {
+driver_executable("sancov") {
   deps = [
     ":Opts",
     "//llvm/lib/DebugInfo/DWARF",