diff --git a/.gn b/.gn
index e5b2befc..a39c5b73 100644
--- a/.gn
+++ b/.gn
@@ -32,5 +32,6 @@ default_args = {
   v8_use_external_startup_data = false
   v8_use_snapshot = true
   is_component_build = false
+  win_crt_flavor_agnostic = true
   symbol_level = 1
 }
diff --git a/BUILD.gn b/BUILD.gn
index a6604643..e2d2ce9c 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -18,7 +18,11 @@ static_library("rusty_v8") {
 }
 
 config("rusty_v8_config") {
-  configs = [ "//v8:external_config", "//v8:toolchain", "//v8:features" ]
+  configs = [
+    "//v8:external_config",
+    "//v8:toolchain",
+    "//v8:features",
+  ]
   cflags = []
 
   # We need these directories in the search path to be able to include some
@@ -42,10 +46,4 @@ config("rusty_v8_config") {
   if (is_debug && is_clang && !is_win) {
     cflags += [ "-glldb" ]
   }
-
-  if (is_win) {
-    # The `/Zl` ("omit default library name") flag makes the compiler produce
-    # object files that can link with both the static and dynamic CRT.
-    cflags += [ "/Zl" ]
-  }
 }
diff --git a/build b/build
index 8e55a652..e10aa6b4 160000
--- a/build
+++ b/build
@@ -1 +1 @@
-Subproject commit 8e55a6521cfbec39fe736537483192ef6af54d36
+Subproject commit e10aa6b45bd82ec89d827724d1074058a28ba04a