diff --git a/.gn b/.gn
index 8f926496..560a53b2 100644
--- a/.gn
+++ b/.gn
@@ -22,7 +22,6 @@ default_args = {
   linux_use_bundled_binutils = false
   use_dummy_lastchange = true
   use_sysroot = false
-  win_crt_flavor_agnostic = true
   simple_template_names = false
 
   # Minimize size of debuginfo in distributed static library.
diff --git a/BUILD.gn b/BUILD.gn
index 20f336f3..3de64b8c 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -24,6 +24,11 @@ config("rusty_v8_config") {
     "//v8:features",
   ]
   cflags = []
+  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" ]
+  }
 
   # We need these directories in the search path to be able to include some
   # internal V8 headers.