[llvm] de7be32 - gn build: libcxx: Add libc include path and re-enable.

[via llvm-commits]

Author: Peter Collingbourne
Date: 2025-02-05T14:46:11-08:00
New Revision: de7be32734dc789ba35602a58f37a14f764ebd58

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

LOG: gn build: libcxx: Add libc include path and re-enable.



Reviewers: aeubanks, nico

Reviewed By: aeubanks

Pull Request: https://github.com/llvm/llvm-project/pull/124679

Added: 
    llvm/utils/gn/secondary/libc/BUILD.gn

Modified: 
    llvm/utils/gn/secondary/BUILD.gn
    llvm/utils/gn/secondary/libcxx/src/BUILD.gn

Removed: 
    


################################################################################
diff  --git a/llvm/utils/gn/secondary/BUILD.gn b/llvm/utils/gn/secondary/BUILD.gn
index 72c4476a147892..5188bb80d17fae 100644
--- a/llvm/utils/gn/secondary/BUILD.gn
+++ b/llvm/utils/gn/secondary/BUILD.gn
@@ -14,8 +14,7 @@ group("default") {
     "//lldb/test",
     "//llvm/test",
   ]
-  # FIXME: Reenable once libc hand-in-hand is figured out.
-  if (false && current_os == "linux") {
+  if (current_os == "linux") {
     deps += [
       "//libcxx",
       "//libcxxabi",

diff  --git a/llvm/utils/gn/secondary/libc/BUILD.gn b/llvm/utils/gn/secondary/libc/BUILD.gn
new file mode 100644
index 00000000000000..9d77afe638da49
--- /dev/null
+++ b/llvm/utils/gn/secondary/libc/BUILD.gn
@@ -0,0 +1,8 @@
+config("common_utils_config") {
+  include_dirs = [ "." ]
+  defines = [ "LIBC_NAMESPACE=__llvm_libc_common_utils" ]
+}
+
+group("common_utils") {
+  public_configs = [ ":common_utils_config" ]
+}

diff  --git a/llvm/utils/gn/secondary/libcxx/src/BUILD.gn b/llvm/utils/gn/secondary/libcxx/src/BUILD.gn
index 2bbe9e8e0a7d32..2bc851a99afb1c 100644
--- a/llvm/utils/gn/secondary/libcxx/src/BUILD.gn
+++ b/llvm/utils/gn/secondary/libcxx/src/BUILD.gn
@@ -247,6 +247,7 @@ if (libcxx_enable_shared) {
     include_dirs = [ "." ]
     deps = [
       "//compiler-rt/lib/builtins",
+      "//libc:common_utils",
       "//libcxx/include",
       "//libcxxabi/src:cxxabi_shared",
       "//libunwind/src:unwind_shared",
@@ -298,6 +299,7 @@ if (libcxx_enable_static) {
     }
     deps = [
       "//compiler-rt/lib/builtins",
+      "//libc:common_utils",
       "//libcxx/include",
       "//libcxxabi/src:cxxabi_static",
       "//libunwind/src:unwind_static",