Skip to content

Commit 6cd296e

Browse files
committed
[gn] port e86a02c (dladdr -> llvm-config.h)
Also set HAVE_DLADDR to 1 on non-Win instead of just on macOS. That looked like an oversight.
1 parent a13148a commit 6cd296e

File tree

1 file changed

+4
-4
lines changed
  • llvm/utils/gn/secondary/llvm/include/llvm/Config

1 file changed

+4
-4
lines changed

llvm/utils/gn/secondary/llvm/include/llvm/Config/BUILD.gn

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,6 @@ write_cmake_config("config") {
156156
values += [
157157
"HAVE_CRASHREPORTER_INFO=1",
158158
"HAVE_DECL_ARC4RANDOM=1",
159-
"HAVE_DLADDR=1",
160159
"HAVE_MACH_MACH_H=1",
161160
"HAVE_MALLOC_MALLOC_H=1",
162161
"HAVE_MALLOC_ZONE_STATISTICS=1",
@@ -168,7 +167,6 @@ write_cmake_config("config") {
168167
values += [
169168
"HAVE_CRASHREPORTER_INFO=",
170169
"HAVE_DECL_ARC4RANDOM=",
171-
"HAVE_DLADDR=",
172170
"HAVE_MACH_MACH_H=",
173171
"HAVE_MALLOC_MALLOC_H=",
174172
"HAVE_MALLOC_ZONE_STATISTICS=",
@@ -207,7 +205,6 @@ write_cmake_config("config") {
207205
if (current_os == "win") {
208206
values += [
209207
"HAVE_DECL_STRERROR_S=1",
210-
"HAVE_DLFCN_H=",
211208
"HAVE_DLOPEN=",
212209
"HAVE_FUTIMES=",
213210
"HAVE_GETPAGESIZE=",
@@ -242,7 +239,6 @@ write_cmake_config("config") {
242239
# POSIX-y system defaults.
243240
values += [
244241
"HAVE_DECL_STRERROR_S=",
245-
"HAVE_DLFCN_H=1",
246242
"HAVE_DLOPEN=1",
247243
"HAVE_FUTIMES=1",
248244
"HAVE_GETPAGESIZE=1",
@@ -362,12 +358,16 @@ write_cmake_config("llvm-config") {
362358

363359
if (current_os == "win") {
364360
values += [
361+
"HAVE_DLADDR=",
362+
"HAVE_DLFCN_H=",
365363
"HAVE_SYSEXITS_H=",
366364
"LLVM_ENABLE_PLUGINS=",
367365
"LLVM_ON_UNIX=",
368366
]
369367
} else {
370368
values += [
369+
"HAVE_DLADDR=1",
370+
"HAVE_DLFCN_H=1",
371371
"HAVE_SYSEXITS_H=1",
372372
"LLVM_ENABLE_PLUGINS=1",
373373
"LLVM_ON_UNIX=1",

0 commit comments

Comments
 (0)