diff --git a/llvm/utils/gn/secondary/compiler-rt/lib/hwasan/BUILD.gn b/llvm/utils/gn/secondary/compiler-rt/lib/hwasan/BUILD.gn
index 0f1d3d2a50e34..e700013d8e258 100644
--- a/llvm/utils/gn/secondary/compiler-rt/lib/hwasan/BUILD.gn
+++ b/llvm/utils/gn/secondary/compiler-rt/lib/hwasan/BUILD.gn
@@ -88,6 +88,13 @@ source_set("cxx_sources") {
   sources = [ "hwasan_new_delete.cpp" ]
 }
 
+source_set("preinit_sources") {
+  configs -= [ "//llvm/utils/gn/build:llvm_code" ]
+  configs += [ "//llvm/utils/gn/build:crt_code" ]
+  defines = [ "HWASAN_WITH_INTERCEPTORS=1" ]
+  sources = [ "hwasan_preinit.cpp" ]
+}
+
 static_library("hwasan_static") {
   output_dir = crt_current_out_dir
   output_name = "clang_rt.$hwasan_name$crt_current_target_suffix"
@@ -97,7 +104,10 @@ static_library("hwasan_static") {
     "//llvm/utils/gn/build:thin_archive",
   ]
   configs += [ "//llvm/utils/gn/build:crt_code" ]
-  deps = [ ":sources" ]
+  deps = [
+    ":preinit_sources",
+    ":sources",
+  ]
 }
 
 static_library("hwasan_cxx") {
@@ -138,15 +148,15 @@ static_library("hwasan_preinit") {
     "//llvm/utils/gn/build:thin_archive",
   ]
   configs += [ "//llvm/utils/gn/build:crt_code" ]
-  sources = [ "hwasan_preinit.cpp" ]
+  deps = [ ":preinit_sources" ]
 }
 
 group("hwasan") {
   deps = [
+    ":hwasan_cxx",
     ":hwasan_preinit",
     ":hwasan_shared",
     ":hwasan_static",
-    ":hwasan_cxx",
     ":version_script",
   ]
 }