[Lldb-commits] [lldb] r241575 - LLDB standalone build: check if Clang was built independently from LLVM

Pavel Labath labath at google.com
Tue Jul 7 05:08:10 PDT 2015


Author: labath
Date: Tue Jul  7 07:08:09 2015
New Revision: 241575

URL: http://llvm.org/viewvc/llvm-project?rev=241575&view=rev
Log:
LLDB standalone build: check if Clang was built independently from LLVM

This is fix for bug 23704: LLDB standalone build always include
ClangConfig.cmake even if Clang was built with LLVM (ClangConfig.cmake
doesn't exist).

Patch by: Eugene Zelenko

Modified:
    lldb/trunk/cmake/modules/LLDBStandalone.cmake

Modified: lldb/trunk/cmake/modules/LLDBStandalone.cmake
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/cmake/modules/LLDBStandalone.cmake?rev=241575&r1=241574&r2=241575&view=diff
==============================================================================
--- lldb/trunk/cmake/modules/LLDBStandalone.cmake (original)
+++ lldb/trunk/cmake/modules/LLDBStandalone.cmake Tue Jul  7 07:08:09 2015
@@ -61,7 +61,9 @@ if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURR
   endif()
   # Import CMake library targets from LLVM and Clang.
   include("${LLDB_PATH_TO_LLVM_BUILD}/share/llvm/cmake/LLVMConfig.cmake")
-  include("${LLDB_PATH_TO_CLANG_BUILD}/share/clang/cmake/ClangConfig.cmake")
+  if (EXISTS "${LLDB_PATH_TO_CLANG_BUILD}/share/clang/cmake/ClangConfig.cmake")
+      include("${LLDB_PATH_TO_CLANG_BUILD}/share/clang/cmake/ClangConfig.cmake")
+  endif()
 
   set(PACKAGE_VERSION "${LLVM_PACKAGE_VERSION}")
 





More information about the lldb-commits mailing list