[PATCH] D39520: [libcxx][CMake] Fix libc++ build when no LLVM source tree is available.

[Volodymyr Sapsai via Phabricator via cfe-commits]

vsapsai created this revision.
Herald added a subscriber: mgorny.

Fixes error

> CMake Error at test/CMakeLists.txt:52 (configure_lit_site_cfg):
>  Unknown CMake command "configure_lit_site_cfg".

configure_lit_site_cfg is defined in AddLLVM module and not available
without LLVM source tree. Revert back to configure_file (reverts part of
r313643).  It is possible as libcxx/test/lit.site.cfg.in doesn't use
latest lit capabilities.

Tested with

- in-tree libcxx - no change in generated lit.site.cfg and running tests;
- standalone libcxx with lit checked out next to it - no CMake errors.

If there are other tricky configurations worth testing, let me know.

rdar://problem/35303262


https://reviews.llvm.org/D39520

Files:
  libcxx/test/CMakeLists.txt


Index: libcxx/test/CMakeLists.txt
===================================================================
--- libcxx/test/CMakeLists.txt
+++ libcxx/test/CMakeLists.txt
@@ -49,9 +49,10 @@
 
 set(AUTO_GEN_COMMENT "## Autogenerated by libcxx configuration.\n# Do not edit!")
 
-configure_lit_site_cfg(
+configure_file(
   ${CMAKE_CURRENT_SOURCE_DIR}/lit.site.cfg.in
-  ${CMAKE_CURRENT_BINARY_DIR}/lit.site.cfg)
+  ${CMAKE_CURRENT_BINARY_DIR}/lit.site.cfg
+  @ONLY)
 
 set(LIBCXX_TEST_DEPS "")
 


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D39520.121212.patch
Type: text/x-patch
Size: 488 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/cfe-commits/attachments/20171101/9b14ed56/attachment.bin>