Skip to content

Commit 650119c

Browse files
committed
[gn] port d430c14 (dladdr check for clang)
1 parent 6c2ad8a commit 650119c

File tree

2 files changed

+14
-6
lines changed
  • llvm/utils/gn/secondary

2 files changed

+14
-6
lines changed

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

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,17 @@ write_cmake_config("Config") {
4444
}
4545

4646
if (host_os != "win") {
47-
values += [ "CLANG_HAVE_RLIMITS=1" ]
47+
values += [
48+
"CLANG_HAVE_DLADDR=1",
49+
"CLANG_HAVE_DLFCN_H=1",
50+
"CLANG_HAVE_RLIMITS=1",
51+
]
4852
} else {
49-
values += [ "CLANG_HAVE_RLIMITS=" ]
53+
values += [
54+
"CLANG_HAVE_DLADDR=",
55+
"CLANG_HAVE_DLFCN_H=",
56+
"CLANG_HAVE_RLIMITS=",
57+
]
5058
}
5159

5260
if (llvm_enable_libxml2) {

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -205,6 +205,8 @@ write_cmake_config("config") {
205205
if (current_os == "win") {
206206
values += [
207207
"HAVE_DECL_STRERROR_S=1",
208+
"HAVE_DLADDR=",
209+
"HAVE_DLFCN_H=",
208210
"HAVE_DLOPEN=",
209211
"HAVE_FUTIMES=",
210212
"HAVE_GETPAGESIZE=",
@@ -239,6 +241,8 @@ write_cmake_config("config") {
239241
# POSIX-y system defaults.
240242
values += [
241243
"HAVE_DECL_STRERROR_S=",
244+
"HAVE_DLADDR=1",
245+
"HAVE_DLFCN_H=1",
242246
"HAVE_DLOPEN=1",
243247
"HAVE_FUTIMES=1",
244248
"HAVE_GETPAGESIZE=1",
@@ -358,16 +362,12 @@ write_cmake_config("llvm-config") {
358362

359363
if (current_os == "win") {
360364
values += [
361-
"HAVE_DLADDR=",
362-
"HAVE_DLFCN_H=",
363365
"HAVE_SYSEXITS_H=",
364366
"LLVM_ENABLE_PLUGINS=",
365367
"LLVM_ON_UNIX=",
366368
]
367369
} else {
368370
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)