Skip to content

Commit 93096bf

Browse files
authored
gn build: Add hwasan_preinit.cpp to hwasan static library to match CMake.
Reviewers: aeubanks Reviewed By: aeubanks Pull Request: #134942
1 parent 0428252 commit 93096bf

File tree

1 file changed

+13
-3
lines changed
  • llvm/utils/gn/secondary/compiler-rt/lib/hwasan

1 file changed

+13
-3
lines changed

llvm/utils/gn/secondary/compiler-rt/lib/hwasan/BUILD.gn

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,13 @@ source_set("cxx_sources") {
8888
sources = [ "hwasan_new_delete.cpp" ]
8989
}
9090

91+
source_set("preinit_sources") {
92+
configs -= [ "//llvm/utils/gn/build:llvm_code" ]
93+
configs += [ "//llvm/utils/gn/build:crt_code" ]
94+
defines = [ "HWASAN_WITH_INTERCEPTORS=1" ]
95+
sources = [ "hwasan_preinit.cpp" ]
96+
}
97+
9198
static_library("hwasan_static") {
9299
output_dir = crt_current_out_dir
93100
output_name = "clang_rt.$hwasan_name$crt_current_target_suffix"
@@ -97,7 +104,10 @@ static_library("hwasan_static") {
97104
"//llvm/utils/gn/build:thin_archive",
98105
]
99106
configs += [ "//llvm/utils/gn/build:crt_code" ]
100-
deps = [ ":sources" ]
107+
deps = [
108+
":preinit_sources",
109+
":sources",
110+
]
101111
}
102112

103113
static_library("hwasan_cxx") {
@@ -138,15 +148,15 @@ static_library("hwasan_preinit") {
138148
"//llvm/utils/gn/build:thin_archive",
139149
]
140150
configs += [ "//llvm/utils/gn/build:crt_code" ]
141-
sources = [ "hwasan_preinit.cpp" ]
151+
deps = [ ":preinit_sources" ]
142152
}
143153

144154
group("hwasan") {
145155
deps = [
156+
":hwasan_cxx",
146157
":hwasan_preinit",
147158
":hwasan_shared",
148159
":hwasan_static",
149-
":hwasan_cxx",
150160
":version_script",
151161
]
152162
}

0 commit comments

Comments
 (0)