labath updated this revision to Diff 45667.
labath added a comment.
Let's try a different approach. This should disable the logic of
LINK_LLVM_DYLIB for lldb binaries, and thereby enabling that build
to work. It should be the safest thing in the short term, and we
can figure out a better fix later.
http://reviews.llvm.org/D16293
Files:
cmake/modules/AddLLDB.cmake
Index: cmake/modules/AddLLDB.cmake
===================================================================
--- cmake/modules/AddLLDB.cmake
+++ cmake/modules/AddLLDB.cmake
@@ -56,7 +56,7 @@
if (PARAM_OBJECT)
add_library(${name} ${libkind} ${srcs})
else()
- llvm_add_library(${name} ${libkind} ${srcs})
+ llvm_add_library(${name} ${libkind} DISABLE_LLVM_LINK_LLVM_DYLIB ${srcs})
lldb_link_common_libs(${name} "${libkind}")
@@ -93,7 +93,7 @@
endmacro(add_lldb_library)
macro(add_lldb_executable name)
- add_llvm_executable(${name} ${ARGN})
+ add_llvm_executable(${name} DISABLE_LLVM_LINK_LLVM_DYLIB ${ARGN})
set_target_properties(${name} PROPERTIES FOLDER "lldb executables")
endmacro(add_lldb_executable)
Index: cmake/modules/AddLLDB.cmake
===================================================================
--- cmake/modules/AddLLDB.cmake
+++ cmake/modules/AddLLDB.cmake
@@ -56,7 +56,7 @@
if (PARAM_OBJECT)
add_library(${name} ${libkind} ${srcs})
else()
- llvm_add_library(${name} ${libkind} ${srcs})
+ llvm_add_library(${name} ${libkind} DISABLE_LLVM_LINK_LLVM_DYLIB ${srcs})
lldb_link_common_libs(${name} "${libkind}")
@@ -93,7 +93,7 @@
endmacro(add_lldb_library)
macro(add_lldb_executable name)
- add_llvm_executable(${name} ${ARGN})
+ add_llvm_executable(${name} DISABLE_LLVM_LINK_LLVM_DYLIB ${ARGN})
set_target_properties(${name} PROPERTIES FOLDER "lldb executables")
endmacro(add_lldb_executable)
_______________________________________________
lldb-commits mailing list
lldb-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
