[compiler-rt] r244634 - [cmake] Handle external source for lld and libcxx

[Chris Bieneman via llvm-commits]

As it is today, compiler-rt does not depend on LLVM, and there is no include for AddLLVM. I don’t think we should change that because I believe we still support compiler-rt being used with GCC.

-Chris

> On Aug 11, 2015, at 11:25 AM, Reid Kleckner <rnk at google.com> wrote:
> 
> Isn't AddLLVM.cmake (along with all of llvm/cmake/modules) copied into the LLVM install directory? Or does the compiler-rt standalone build simply not depend on LLVM?
> 
> On Tue, Aug 11, 2015 at 11:15 AM, Chris Bieneman <beanz at apple.com <mailto:beanz at apple.com>> wrote:
> This breaks standalone compiler-rt builds because it adds a dependency on AddLLVM.cmake which isn’t relied on anywhere else.
> 
> We should consider doing this differently since the plans for compiler-rt's CMake rely on standalone builds working.
> 
> -Chris
> 
> > On Aug 11, 2015, at 10:18 AM, Reid Kleckner via llvm-commits <llvm-commits at lists.llvm.org <mailto:llvm-commits at lists.llvm.org>> wrote:
> >
> > Author: rnk
> > Date: Tue Aug 11 12:18:23 2015
> > New Revision: 244634
> >
> > URL: http://llvm.org/viewvc/llvm-project?rev=244634&view=rev <http://llvm.org/viewvc/llvm-project?rev=244634&view=rev>
> > Log:
> > [cmake] Handle external source for lld and libcxx
> >
> > As requested in post-commit review of r244549.
> >
> > Modified:
> >    compiler-rt/trunk/CMakeLists.txt
> >
> > Modified: compiler-rt/trunk/CMakeLists.txt
> > URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/CMakeLists.txt?rev=244634&r1=244633&r2=244634&view=diff <http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/CMakeLists.txt?rev=244634&r1=244633&r2=244634&view=diff>
> > ==============================================================================
> > --- compiler-rt/trunk/CMakeLists.txt (original)
> > +++ compiler-rt/trunk/CMakeLists.txt Tue Aug 11 12:18:23 2015
> > @@ -348,14 +348,14 @@ pythonize_bool(SANITIZER_CAN_USE_CXXABI)
> >
> > add_subdirectory(include)
> >
> > -set(COMPILER_RT_LIBCXX_PATH ${LLVM_MAIN_SRC_DIR}/projects/libcxx)
> > +find_llvm_external_project(projects libcxx COMPILER_RT_LIBCXX_PATH)
> > if(EXISTS ${COMPILER_RT_LIBCXX_PATH}/)
> >   set(COMPILER_RT_HAS_LIBCXX_SOURCES TRUE)
> > else()
> >   set(COMPILER_RT_HAS_LIBCXX_SOURCES FALSE)
> > endif()
> >
> > -set(COMPILER_RT_LLD_PATH ${LLVM_MAIN_SRC_DIR}/tools/lld)
> > +find_llvm_external_project(projects libcxx COMPILER_RT_LLD_PATH)
> > if(EXISTS ${COMPILER_RT_LLD_PATH}/)
> >   set(COMPILER_RT_HAS_LLD_SOURCES TRUE)
> > else()
> >
> >
> > _______________________________________________
> > llvm-commits mailing list
> > llvm-commits at lists.llvm.org <mailto:llvm-commits at lists.llvm.org>
> > http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits <http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits>
> 
> 

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20150811/b46f8ed3/attachment.html>