summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZachary Turner <zturner@google.com>2018-11-03 00:06:37 +0000
committerZachary Turner <zturner@google.com>2018-11-03 00:06:37 +0000
commit40d95a27a2096f63d22bc2fa8fd985350a3aa61e (patch)
tree56bd035860472ab80a5592ece6e78ae21a685fff
parent869af342c7f3be86cadb3b3a44231f2b16620418 (diff)
downloadbcm5719-llvm-40d95a27a2096f63d22bc2fa8fd985350a3aa61e.tar.gz
bcm5719-llvm-40d95a27a2096f63d22bc2fa8fd985350a3aa61e.zip
Make sure to have lit load the configured site config first.
For the lldb unit test suite, we forgot to add the mapping from site config to main config, so when it found the main config in the source tree, it wasn't going and loading the configured version in the build tree first, so the required properties weren't getting set up properly. llvm-svn: 346057
-rw-r--r--lldb/lit/CMakeLists.txt4
1 files changed, 3 insertions, 1 deletions
diff --git a/lldb/lit/CMakeLists.txt b/lldb/lit/CMakeLists.txt
index 657571d86ef..8ff7cf17961 100644
--- a/lldb/lit/CMakeLists.txt
+++ b/lldb/lit/CMakeLists.txt
@@ -57,7 +57,9 @@ configure_lit_site_cfg(
${CMAKE_CURRENT_SOURCE_DIR}/lit.cfg.py)
configure_lit_site_cfg(
${CMAKE_CURRENT_SOURCE_DIR}/Unit/lit.site.cfg.py.in
- ${CMAKE_CURRENT_BINARY_DIR}/Unit/lit.site.cfg.py)
+ ${CMAKE_CURRENT_BINARY_DIR}/Unit/lit.site.cfg.py
+ MAIN_CONFIG
+ ${CMAKE_CURRENT_SOURCE_DIR}/Unit/lit.cfg.py)
configure_lit_site_cfg(
${CMAKE_CURRENT_SOURCE_DIR}/Suite/lit.site.cfg.in
${CMAKE_CURRENT_BINARY_DIR}/Suite/lit.site.cfg)
OpenPOWER on IntegriCloud