diff --git a/BUILD.gn b/BUILD.gn
index 860247cb..e38e78a4 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -148,6 +148,7 @@ source_set("glslang_sources") {
       "-Wno-inconsistent-missing-override",
       "-Wno-sign-compare",
       "-Wno-unused-variable",
+      "-Wno-missing-field-initializers",
     ]
   }
   if (is_win && !is_clang) {
@@ -186,3 +187,13 @@ executable("glslang_validator") {
     ":glslang_sources",
   ]
 }
+
+executable("spirv-remap") {
+  sources = [
+    "StandAlone/spirv-remap.cpp",
+  ]
+  defines = [ "ENABLE_OPT=1" ]
+  deps = [
+    ":glslang_sources",
+  ]
+}