diff --git a/llvm/utils/gn/secondary/lld/test/BUILD.gn b/llvm/utils/gn/secondary/lld/test/BUILD.gn
index bee3aab5ef05..569880a3c3d8 100644
--- a/llvm/utils/gn/secondary/lld/test/BUILD.gn
+++ b/llvm/utils/gn/secondary/lld/test/BUILD.gn
@@ -6,45 +6,35 @@ import("//llvm/utils/gn/build/libs/zlib/enable.gni")
 import("//llvm/utils/gn/build/write_cmake_config.gni")
 import("lld_lit_site_cfg_files.gni")
 
-# The bits common to writing lit.site.cfg.py.in and Unit/lit.site.cfg.py.in.
-template("write_lit_cfg") {
-  write_cmake_config(target_name) {
-    input = invoker.input
-    output = invoker.output
-    values = [
-      "LIT_SITE_CFG_IN_HEADER=## Autogenerated from $input, do not edit",
-      "LLD_BINARY_DIR=" +
-          rebase_path(get_label_info("//lld", "target_out_dir")),
-      "CURRENT_LIBS_DIR=",  # FIXME: for shared builds only (?)
-      "CURRENT_TOOLS_DIR=" + rebase_path("$root_out_dir/bin"),
-      "LLD_SOURCE_DIR=" + rebase_path("//lld"),
-      "LLVM_BINARY_DIR=" +
-          rebase_path(get_label_info("//llvm", "target_out_dir")),
-      "LLVM_LIBS_DIR=",  # needed only for shared builds
-      "LLVM_LIT_TOOLS_DIR=",  # Intentionally empty, matches cmake build.
-      "LLVM_SOURCE_DIR=" + rebase_path("//llvm"),
-      "LLVM_TOOLS_DIR=" + rebase_path("$root_out_dir/bin"),
-      "Python3_EXECUTABLE=$python_path",
-      "LLVM_TARGET_TRIPLE=$llvm_target_triple",
-    ]
-    values += invoker.extra_values
-  }
-}
-
-write_lit_cfg("lit_site_cfg") {
+write_cmake_config("lit_site_cfg") {
   # Fully-qualified instead of relative for LIT_SITE_CFG_IN_HEADER.
   input = "//lld/test/lit.site.cfg.py.in"
   output = lld_lit_site_cfg_file
   dir = get_path_info(output, "dir")
 
-  extra_values = [
+  values = [
+    "LIT_SITE_CFG_IN_HEADER=## Autogenerated from $input, do not edit",
+    "LLD_BINARY_DIR=" +
+        rebase_path(get_label_info("//lld", "target_out_dir")),
+    "CURRENT_LIBS_DIR=",  # FIXME: for shared builds only (?)
+    "CURRENT_TOOLS_DIR=" + rebase_path("$root_out_dir/bin"),
+    "LLD_SOURCE_DIR=" + rebase_path("//lld"),
+    "LLVM_BINARY_DIR=" +
+        rebase_path(get_label_info("//llvm", "target_out_dir")),
+    "LLVM_LIBS_DIR=",  # needed only for shared builds
+    "LLVM_LIT_TOOLS_DIR=",  # Intentionally empty, matches cmake build.
+    "LLVM_SOURCE_DIR=" + rebase_path("//llvm"),
+    "LLVM_TOOLS_DIR=" + rebase_path("$root_out_dir/bin"),
+    "Python3_EXECUTABLE=$python_path",
+    "LLVM_TARGET_TRIPLE=$llvm_target_triple",
+
     "LLD_DEFAULT_LD_LLD_IS_MINGW=0",
     "LLVM_BUILD_EXAMPLES=0",
     "LLVM_BYE_LINK_INTO_TOOLS=0",
   ]
 
   if (host_os == "win") {
-    extra_values += [
+    values += [
       "LLVM_LIT_ERRC_MESSAGES=no such file or directory;is a directory;" +
           "invalid argument;permission denied",
       "LLVM_ENABLE_PLUGINS=0",
@@ -53,7 +43,7 @@ write_lit_cfg("lit_site_cfg") {
       "SHLIBDIR=" + rebase_path("$root_out_dir/bin", dir),
     ]
   } else {
-    extra_values += [
+    values += [
       "LLVM_LIT_ERRC_MESSAGES=",
       "LLVM_ENABLE_PLUGINS=1",
       "SHLIBDIR=" + rebase_path("$root_out_dir/lib", dir),
@@ -61,59 +51,51 @@ write_lit_cfg("lit_site_cfg") {
   }
 
   if (host_os == "mac") {
-    extra_values += [ "SHLIBEXT=.dylib" ]
+    values += [ "SHLIBEXT=.dylib" ]
   } else if (host_os == "win") {
-    extra_values += [ "SHLIBEXT=.dll" ]
+    values += [ "SHLIBEXT=.dll" ]
   } else {
-    extra_values += [ "SHLIBEXT=.so" ]
+    values += [ "SHLIBEXT=.so" ]
   }
 
   if (llvm_enable_dia_sdk) {
-    extra_values += [ "LLVM_ENABLE_DIA_SDK=1" ]
+    values += [ "LLVM_ENABLE_DIA_SDK=1" ]
   } else {
-    extra_values += [ "LLVM_ENABLE_DIA_SDK=0" ]  # Must be 0.
+    values += [ "LLVM_ENABLE_DIA_SDK=0" ]  # Must be 0.
   }
 
   if (llvm_enable_libxar) {
-    extra_values += [ "LLVM_HAVE_LIBXAR=1" ]
+    values += [ "LLVM_HAVE_LIBXAR=1" ]
   } else {
-    extra_values += [ "LLVM_HAVE_LIBXAR=0" ]  # Must be 0.
+    values += [ "LLVM_HAVE_LIBXAR=0" ]  # Must be 0.
   }
 
   if (llvm_enable_libxml2) {
-    extra_values += [ "LLVM_ENABLE_LIBXML2=1" ]
+    values += [ "LLVM_ENABLE_LIBXML2=1" ]
   } else {
-    extra_values += [ "LLVM_ENABLE_LIBXML2=0" ]  # Must be 0.
+    values += [ "LLVM_ENABLE_LIBXML2=0" ]  # Must be 0.
   }
 
   if (llvm_enable_zlib) {
-    extra_values += [ "LLVM_ENABLE_ZLIB=1" ]
+    values += [ "LLVM_ENABLE_ZLIB=1" ]
   } else {
-    extra_values += [ "LLVM_ENABLE_ZLIB=0" ]  # Must be 0.
+    values += [ "LLVM_ENABLE_ZLIB=0" ]  # Must be 0.
   }
 
   if (current_cpu == "x64" || current_cpu == "arm64" ||
       current_cpu == "ppc64") {
-    extra_values += [ "CMAKE_SIZEOF_VOID_P=8" ]
+    values += [ "CMAKE_SIZEOF_VOID_P=8" ]
   } else {
-    extra_values += [ "CMAKE_SIZEOF_VOID_P=4" ]
+    values += [ "CMAKE_SIZEOF_VOID_P=4" ]
   }
 }
 
-write_lit_cfg("lit_unit_site_cfg") {
-  # Fully-qualified instead of relative for LIT_SITE_CFG_IN_HEADER.
-  input = "//lld/test/Unit/lit.site.cfg.py.in"
-  output = lld_lit_unit_site_cfg_file
-  extra_values = [ "LLVM_BUILD_MODE=." ]
-}
-
 # This target should contain all dependencies of check-lld.
 # //:default depends on it, so that ninja's default target builds all
 # prerequisites for check-lld but doesn't run check-lld itself.
 group("test") {
   deps = [
     ":lit_site_cfg",
-    ":lit_unit_site_cfg",
     "//lld/tools/lld:symlinks",
     "//llvm/tools/dsymutil",
     "//llvm/tools/llc",
diff --git a/llvm/utils/gn/secondary/llvm/utils/llvm-lit/BUILD.gn b/llvm/utils/gn/secondary/llvm/utils/llvm-lit/BUILD.gn
index 2e43ec0ef63d..b317b969312b 100644
--- a/llvm/utils/gn/secondary/llvm/utils/llvm-lit/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/utils/llvm-lit/BUILD.gn
@@ -30,7 +30,6 @@ write_cmake_config("llvm-lit") {
     "//clang/test:lit_site_cfg",
     "//clang/test:lit_unit_site_cfg",
     "//lld/test:lit_site_cfg",
-    "//lld/test:lit_unit_site_cfg",
     "//lldb/test:lit_api_site_cfg",
     "//lldb/test:lit_shell_site_cfg",
     "//lldb/test:lit_site_cfg",