summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lldb/lit/CMakeLists.txt4
-rw-r--r--lldb/lit/helper/toolchain.py4
-rw-r--r--lldb/lit/lit-lldb-init.in (renamed from lldb/lit/lit-lldb-init)0
3 files changed, 6 insertions, 2 deletions
diff --git a/lldb/lit/CMakeLists.txt b/lldb/lit/CMakeLists.txt
index f96fa62fd32..672f05e3c0e 100644
--- a/lldb/lit/CMakeLists.txt
+++ b/lldb/lit/CMakeLists.txt
@@ -81,6 +81,10 @@ configure_lit_site_cfg(
${CMAKE_CURRENT_SOURCE_DIR}/Suite/lit.site.cfg.in
${CMAKE_CURRENT_BINARY_DIR}/Suite/lit.site.cfg)
+configure_file(
+ ${CMAKE_CURRENT_SOURCE_DIR}/lit-lldb-init.in
+ ${CMAKE_CURRENT_BINARY_DIR}/lit-lldb-init)
+
if(NOT LLDB_BUILT_STANDALONE)
list(APPEND LLDB_TEST_DEPS
FileCheck
diff --git a/lldb/lit/helper/toolchain.py b/lldb/lit/helper/toolchain.py
index 08fb7fe8980..9f758972fea 100644
--- a/lldb/lit/helper/toolchain.py
+++ b/lldb/lit/helper/toolchain.py
@@ -38,12 +38,12 @@ def use_lldb_substitutions(config):
ToolSubst('%lldb',
command=FindTool('lldb'),
extra_args=['--no-lldbinit', '-S',
- os.path.join(config.test_source_root,
+ os.path.join(config.test_exec_root,
'lit-lldb-init')]),
ToolSubst('%lldb-init',
command=FindTool('lldb'),
extra_args=['-S',
- os.path.join(config.test_source_root,
+ os.path.join(config.test_exec_root,
'lit-lldb-init')]),
lldbmi,
ToolSubst('%debugserver',
diff --git a/lldb/lit/lit-lldb-init b/lldb/lit/lit-lldb-init.in
index 40bece698df..40bece698df 100644
--- a/lldb/lit/lit-lldb-init
+++ b/lldb/lit/lit-lldb-init.in
OpenPOWER on IntegriCloud