diff --git a/llvm/utils/gn/secondary/llvm/lib/Target/targets.gni b/llvm/utils/gn/secondary/llvm/lib/Target/targets.gni
index 102040c2fa82da..22da518ea1fb9e 100644
--- a/llvm/utils/gn/secondary/llvm/lib/Target/targets.gni
+++ b/llvm/utils/gn/secondary/llvm/lib/Target/targets.gni
@@ -49,6 +49,7 @@ llvm_build_ARM = false
 llvm_build_BPF = false
 llvm_build_Mips = false
 llvm_build_PowerPC = false
+llvm_build_SystemZ = false
 llvm_build_WebAssembly = false
 llvm_build_X86 = false
 foreach(target, llvm_targets_to_build) {
@@ -64,6 +65,8 @@ foreach(target, llvm_targets_to_build) {
     llvm_build_Mips = true
   } else if (target == "PowerPC") {
     llvm_build_PowerPC = true
+  } else if (target == "SystemZ") {
+    llvm_build_SystemZ = true
   } else if (target == "WebAssembly") {
     llvm_build_WebAssembly = true
   } else if (target == "X86") {
diff --git a/llvm/utils/gn/secondary/llvm/unittests/BUILD.gn b/llvm/utils/gn/secondary/llvm/unittests/BUILD.gn
index 4942f4b1445965..949816308a525d 100644
--- a/llvm/utils/gn/secondary/llvm/unittests/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/unittests/BUILD.gn
@@ -80,6 +80,9 @@ group("unittests") {
       "tools/llvm-exegesis/PowerPC:LLVMExegesisPowerPCTests",
     ]
   }
+  if (llvm_build_SystemZ) {
+    deps += [ "MC/SystemZ:SystemZAsmLexerTests" ]
+  }
   if (llvm_build_WebAssembly) {
     deps += [ "Target/WebAssembly:WebAssemblyTests" ]
   }
diff --git a/llvm/utils/gn/secondary/llvm/unittests/MC/SystemZ/BUILD.gn b/llvm/utils/gn/secondary/llvm/unittests/MC/SystemZ/BUILD.gn
new file mode 100644
index 00000000000000..637fc342d489c8
--- /dev/null
+++ b/llvm/utils/gn/secondary/llvm/unittests/MC/SystemZ/BUILD.gn
@@ -0,0 +1,11 @@
+import("//llvm/utils/unittest/unittest.gni")
+
+unittest("SystemZAsmLexerTests") {
+  deps = [
+    "//llvm/lib/MC",
+    "//llvm/lib/MC/MCParser",
+    "//llvm/lib/Support",
+    "//llvm/lib/Target/SystemZ",
+  ]
+  sources = [ "SystemZAsmLexerTest.cpp" ]
+}