Skip to content

Commit de7be32

Browse files
authored
gn build: libcxx: Add libc include path and re-enable.
Reviewers: aeubanks, nico Reviewed By: aeubanks Pull Request: llvm#124679
1 parent fd4c4ed commit de7be32

File tree

3 files changed

+11
-2
lines changed

3 files changed

+11
-2
lines changed

llvm/utils/gn/secondary/BUILD.gn

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,7 @@ group("default") {
1414
"//lldb/test",
1515
"//llvm/test",
1616
]
17-
# FIXME: Reenable once libc hand-in-hand is figured out.
18-
if (false && current_os == "linux") {
17+
if (current_os == "linux") {
1918
deps += [
2019
"//libcxx",
2120
"//libcxxabi",

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
config("common_utils_config") {
2+
include_dirs = [ "." ]
3+
defines = [ "LIBC_NAMESPACE=__llvm_libc_common_utils" ]
4+
}
5+
6+
group("common_utils") {
7+
public_configs = [ ":common_utils_config" ]
8+
}

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -247,6 +247,7 @@ if (libcxx_enable_shared) {
247247
include_dirs = [ "." ]
248248
deps = [
249249
"//compiler-rt/lib/builtins",
250+
"//libc:common_utils",
250251
"//libcxx/include",
251252
"//libcxxabi/src:cxxabi_shared",
252253
"//libunwind/src:unwind_shared",
@@ -298,6 +299,7 @@ if (libcxx_enable_static) {
298299
}
299300
deps = [
300301
"//compiler-rt/lib/builtins",
302+
"//libc:common_utils",
301303
"//libcxx/include",
302304
"//libcxxabi/src:cxxabi_static",
303305
"//libunwind/src:unwind_static",

0 commit comments

Comments
 (0)