Skip to content

Commit a7968f6

Browse files
committed
[gn] port 32e90bb (lldb remote tests)
Possibly not enough to run tests, but enough to fix build.
1 parent 388c693 commit a7968f6

File tree

1 file changed

+11
-1
lines changed
  • llvm/utils/gn/secondary/lldb/test

1 file changed

+11
-1
lines changed

llvm/utils/gn/secondary/lldb/test/BUILD.gn

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ write_lit_cfg("lit_api_site_cfg") {
5252
input = "//lldb/test/API/lit.site.cfg.py.in"
5353
output = lldb_lit_api_site_cfg_file
5454
extra_values = [
55+
"DEFAULT_SYSROOT=",
5556
"LIBCXX_LIBRARY_DIR=" + rebase_path("$root_build_dir/lib"),
5657
"LIBCXX_GENERATED_INCLUDE_DIR=" +
5758
rebase_path("$root_build_dir/include/c++/v1"),
@@ -73,6 +74,9 @@ write_lit_cfg("lit_api_site_cfg") {
7374
"LLDB_TEST_MODULE_CACHE_LLDB=" +
7475
rebase_path(
7576
"$target_gen_dir/lldb-test-build.noindex/module-cache-lldb"),
77+
"LLDB_TEST_PLATFORM_URL=",
78+
"LLDB_TEST_PLATFORM_WORKING_DIR=",
79+
"LLDB_TEST_SYSROOT=",
7680
"LLVM_BUILD_MODE=.",
7781
"LLVM_ENABLE_SHARED_LIBS=0",
7882
"LLVM_HOST_TRIPLE=$llvm_current_triple",
@@ -98,10 +102,12 @@ write_lit_cfg("lit_shell_site_cfg") {
98102
input = "//lldb/test/Shell/lit.site.cfg.py.in"
99103
output = lldb_lit_shell_site_cfg_file
100104
extra_values = [
101-
"CMAKE_SYSROOT=",
105+
"DEFAULT_SYSROOT=",
106+
"LIBCXX_LIBRARY_DIR=" + rebase_path("$root_build_dir/lib"),
102107
"LLDB_ENABLE_LUA=0", # FIXME: gn arg, use in Config.h
103108
"LLDB_ENABLE_LZMA=0", # FIXME: gn arg, use in Config.h
104109
"LLDB_ENABLE_PYTHON=0", # FIXME: gn arg, use in Config.h
110+
"LLDB_HAS_LIBCXX=False", # FIXME: support this (?)
105111
"LLDB_IS_64_BITS=1",
106112
"LLDB_LIBS_DIR=", # FIXME: for shared builds only (?)
107113
"LLDB_LIT_TOOLS_DIR=", # Intentionally empty, matches cmake build.
@@ -113,6 +119,10 @@ write_lit_cfg("lit_shell_site_cfg") {
113119
rebase_path(
114120
"$target_gen_dir/lldb-test-build.noindex/module-cache-lldb"),
115121
"LLDB_TEST_OBJC_GNUSTEP_DIR=",
122+
"LLDB_TEST_PLATFORM_URL=",
123+
"LLDB_TEST_PLATFORM_WORKING_DIR=",
124+
"LLDB_TEST_SHELL_DISABLE_REMOTE=True",
125+
"LLDB_TEST_SYSROOT=",
116126
"LLDB_TOOL_LLDB_SERVER_BUILD=1",
117127
"LLDB_TOOLS_DIR=" + rebase_path("$root_out_dir/bin"),
118128
"LLDB_USE_SYSTEM_DEBUGSERVER=1", # XXX port //lldb/tools/debugserver (?)

0 commit comments

Comments
 (0)