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

[Volodymyr Sapsai via cfe-commits]

On Nov 1, 2017, at 16:47, Zachary Turner <zturner at google.com> wrote:
> 
> This will remove the ability to use llvm-lit script even if source tree is available.
Can you please point me to the place where llvm-lit is enabled in configure_lit_site_cfg? Asking for my education, to understand lit configuration better and to avoid breaking it. And how do you test llvm-lit script if source tree is available? I tried to check out libcxx to llvm/projects/, `ninja check-libcxx` worked fine. Though I didn’t use extra options, so this case might not reflect real-world usage.

> Can you put this behind a check that for standalone build?
> 
> Also, why was this just found? shouldnt this have been failing on Apple’s libcxx for the past several months?
It was found earlier, this specific fix is submitted for review only now.

> On Wed, Nov 1, 2017 at 4:38 PM Volodymyr Sapsai via Phabricator <reviews at reviews.llvm.org <mailto:reviews at reviews.llvm.org>> wrote:
> 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 <http://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 <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 <http://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 --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/cfe-commits/attachments/20171101/d9b8b301/attachment.html>