[llvm] 6cd296e - [gn] port e86a02ce89c33f3fa (dladdr -> llvm-config.h)

[Nico Weber via llvm-commits]

Author: Nico Weber
Date: 2023-12-20T09:57:37-05:00
New Revision: 6cd296ed855b47036551e9f5c19bac89b81d5f72

URL: https://github.com/llvm/llvm-project/commit/6cd296ed855b47036551e9f5c19bac89b81d5f72
DIFF: https://github.com/llvm/llvm-project/commit/6cd296ed855b47036551e9f5c19bac89b81d5f72.diff

LOG: [gn] port e86a02ce89c33f3fa (dladdr -> llvm-config.h)

Also set HAVE_DLADDR to 1 on non-Win instead of just on macOS.
That looked like an oversight.

Added: 
    

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

Removed: 
    


################################################################################
diff  --git a/llvm/utils/gn/secondary/llvm/include/llvm/Config/BUILD.gn b/llvm/utils/gn/secondary/llvm/include/llvm/Config/BUILD.gn
index bfc6717b24449d..2478b2f8a861c8 100644
--- a/llvm/utils/gn/secondary/llvm/include/llvm/Config/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/include/llvm/Config/BUILD.gn
@@ -156,7 +156,6 @@ write_cmake_config("config") {
     values += [
       "HAVE_CRASHREPORTER_INFO=1",
       "HAVE_DECL_ARC4RANDOM=1",
-      "HAVE_DLADDR=1",
       "HAVE_MACH_MACH_H=1",
       "HAVE_MALLOC_MALLOC_H=1",
       "HAVE_MALLOC_ZONE_STATISTICS=1",
@@ -168,7 +167,6 @@ write_cmake_config("config") {
     values += [
       "HAVE_CRASHREPORTER_INFO=",
       "HAVE_DECL_ARC4RANDOM=",
-      "HAVE_DLADDR=",
       "HAVE_MACH_MACH_H=",
       "HAVE_MALLOC_MALLOC_H=",
       "HAVE_MALLOC_ZONE_STATISTICS=",
@@ -207,7 +205,6 @@ write_cmake_config("config") {
   if (current_os == "win") {
     values += [
       "HAVE_DECL_STRERROR_S=1",
-      "HAVE_DLFCN_H=",
       "HAVE_DLOPEN=",
       "HAVE_FUTIMES=",
       "HAVE_GETPAGESIZE=",
@@ -242,7 +239,6 @@ write_cmake_config("config") {
     # POSIX-y system defaults.
     values += [
       "HAVE_DECL_STRERROR_S=",
-      "HAVE_DLFCN_H=1",
       "HAVE_DLOPEN=1",
       "HAVE_FUTIMES=1",
       "HAVE_GETPAGESIZE=1",
@@ -362,12 +358,16 @@ write_cmake_config("llvm-config") {
 
   if (current_os == "win") {
     values += [
+      "HAVE_DLADDR=",
+      "HAVE_DLFCN_H=",
       "HAVE_SYSEXITS_H=",
       "LLVM_ENABLE_PLUGINS=",
       "LLVM_ON_UNIX=",
     ]
   } else {
     values += [
+      "HAVE_DLADDR=1",
+      "HAVE_DLFCN_H=1",
       "HAVE_SYSEXITS_H=1",
       "LLVM_ENABLE_PLUGINS=1",
       "LLVM_ON_UNIX=1",