[llvm-branch-commits] [lldb] r240419 - LLDB standalone build: check if Clang was built independently from LLVM

Tom Stellard thomas.stellard at amd.com
Tue Jun 23 08:36:33 PDT 2015


Author: tstellar
Date: Tue Jun 23 10:36:33 2015
New Revision: 240419

URL: http://llvm.org/viewvc/llvm-project?rev=240419&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/branches/release_36/CMakeLists.txt

Modified: lldb/branches/release_36/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/lldb/branches/release_36/CMakeLists.txt?rev=240419&r1=240418&r2=240419&view=diff
==============================================================================
--- lldb/branches/release_36/CMakeLists.txt (original)
+++ lldb/branches/release_36/CMakeLists.txt Tue Jun 23 10:36:33 2015
@@ -85,7 +85,9 @@ if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURR
 
   # 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 llvm-branch-commits mailing list