[llvm] 13956fd - [gn] port c3a302d399e6 (SymbolLocator) more

[Nico Weber via llvm-commits]

Author: Nico Weber
Date: 2023-11-05T13:08:41+01:00
New Revision: 13956fd27f59f7570a49c2155f09caf8e1297796

URL: https://github.com/llvm/llvm-project/commit/13956fd27f59f7570a49c2155f09caf8e1297796
DIFF: https://github.com/llvm/llvm-project/commit/13956fd27f59f7570a49c2155f09caf8e1297796.diff

LOG: [gn] port c3a302d399e6 (SymbolLocator) more

I forgot that lldb/source/Plugins/CMakeLists.txt implicitly builds
all enums via LLDB_ENUM_PLUGINS / Plugins.def.in.

Now the GN build does this for the SymbolLocator plugins too.

(Also fix some minor stuff now that they actually build.)

Added: 
    

Modified: 
    llvm/utils/gn/secondary/lldb/source/Plugins/BUILD.gn
    llvm/utils/gn/secondary/lldb/source/Plugins/SymbolLocator/DebugSymbols/BUILD.gn
    llvm/utils/gn/secondary/lldb/source/Plugins/SymbolLocator/Default/BUILD.gn

Removed: 
    


################################################################################
diff  --git a/llvm/utils/gn/secondary/lldb/source/Plugins/BUILD.gn b/llvm/utils/gn/secondary/lldb/source/Plugins/BUILD.gn
index 4c085bf7b622ab4..06dde7c0aa5287e 100644
--- a/llvm/utils/gn/secondary/lldb/source/Plugins/BUILD.gn
+++ b/llvm/utils/gn/secondary/lldb/source/Plugins/BUILD.gn
@@ -160,12 +160,22 @@ lldb_plugins += [
     "//lldb/source/Plugins/SymbolFile/Symtab",
     "SymbolFileSymtab",
   ],
+  [
+    "//lldb/source/Plugins/SymbolLocator/Default",
+    "SymbolLocatorDefault",
+  ],
 ]
 if (current_os == "mac") {
-  lldb_plugins += [ [
-        "//lldb/source/Plugins/SymbolVendor/MacOSX",
-        "SymbolVendorMacOSX",
-      ] ]
+  lldb_plugins += [
+    [
+      "//lldb/source/Plugins/SymbolLocator/DebugSymbols",
+      "SymbolLocatorDebugSymbols",
+    ],
+    [
+      "//lldb/source/Plugins/SymbolVendor/MacOSX",
+      "SymbolVendorMacOSX",
+    ],
+  ]
 }
 lldb_plugins += [
   [

diff  --git a/llvm/utils/gn/secondary/lldb/source/Plugins/SymbolLocator/DebugSymbols/BUILD.gn b/llvm/utils/gn/secondary/lldb/source/Plugins/SymbolLocator/DebugSymbols/BUILD.gn
index 1006d8d8729972c..89d52fe90d9cc79 100644
--- a/llvm/utils/gn/secondary/lldb/source/Plugins/SymbolLocator/DebugSymbols/BUILD.gn
+++ b/llvm/utils/gn/secondary/lldb/source/Plugins/SymbolLocator/DebugSymbols/BUILD.gn
@@ -1,5 +1,5 @@
 static_library("DebugSymbols") {
-  output_name = "lldbPluginSymbolLocatorDebugSymbols "
+  output_name = "lldbPluginSymbolLocatorDebugSymbols"
   configs += [ "//llvm/utils/gn/build:lldb_code" ]
   deps = [
     "//lldb/source/Core",
@@ -7,5 +7,7 @@ static_library("DebugSymbols") {
     "//lldb/source/Symbol",
   ]
 
+  # Reaches into Plugins/ObjectFile/wasm.
+  include_dirs = [ "//lldb/source" ]
   sources = [ "SymbolLocatorDebugSymbols.cpp" ]
 }

diff  --git a/llvm/utils/gn/secondary/lldb/source/Plugins/SymbolLocator/Default/BUILD.gn b/llvm/utils/gn/secondary/lldb/source/Plugins/SymbolLocator/Default/BUILD.gn
index c43cf866b2fadcd..b8cb232fd2e206d 100644
--- a/llvm/utils/gn/secondary/lldb/source/Plugins/SymbolLocator/Default/BUILD.gn
+++ b/llvm/utils/gn/secondary/lldb/source/Plugins/SymbolLocator/Default/BUILD.gn
@@ -1,5 +1,5 @@
-static_library("DebugSymbols") {
-  output_name = "lldbPluginSymbolLocatorDefault "
+static_library("Default") {
+  output_name = "lldbPluginSymbolLocatorDefault"
   configs += [ "//llvm/utils/gn/build:lldb_code" ]
   deps = [
     "//lldb/source/Core",
@@ -7,5 +7,7 @@ static_library("DebugSymbols") {
     "//lldb/source/Symbol",
   ]
 
+  # Reaches into Plugins/ObjectFile/wasm.
+  include_dirs = [ "//lldb/source" ]
   sources = [ "SymbolLocatorDefault.cpp" ]
 }