rebase of the patches

This commit is contained in:
Sylvestre Ledru 2019-07-11 11:19:09 +02:00
parent 4296b9b01e
commit b2f8ae5e9c
2 changed files with 17 additions and 19 deletions

View File

@ -2,12 +2,12 @@
lldb/source/API/CMakeLists.txt | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
Index: llvm-toolchain-snapshot_9~svn358740/lldb/source/API/CMakeLists.txt
Index: llvm-toolchain-snapshot_9~svn365742/lldb/source/API/CMakeLists.txt
===================================================================
--- llvm-toolchain-snapshot_9~svn358740.orig/lldb/source/API/CMakeLists.txt
+++ llvm-toolchain-snapshot_9~svn358740/lldb/source/API/CMakeLists.txt
@@ -13,7 +13,12 @@ if(LLDB_BUILD_FRAMEWORK AND LLVM_EXTERNA
set(LLVM_EXTERNALIZE_DEBUGINFO_EXTENSION framework.dSYM)
--- llvm-toolchain-snapshot_9~svn365742.orig/lldb/source/API/CMakeLists.txt
+++ llvm-toolchain-snapshot_9~svn365742/lldb/source/API/CMakeLists.txt
@@ -13,7 +13,12 @@ if(LLDB_BUILD_FRAMEWORK)
set(option_install_prefix INSTALL_PREFIX ${LLDB_FRAMEWORK_INSTALL_DIR})
endif()
-add_lldb_library(liblldb SHARED
@ -20,7 +20,7 @@ Index: llvm-toolchain-snapshot_9~svn358740/lldb/source/API/CMakeLists.txt
SBAddress.cpp
SBAttachInfo.cpp
SBBlock.cpp
@@ -128,7 +133,7 @@ endif()
@@ -130,7 +135,7 @@ endif()
set_target_properties(liblldb
PROPERTIES
@ -29,7 +29,7 @@ Index: llvm-toolchain-snapshot_9~svn358740/lldb/source/API/CMakeLists.txt
)
if (NOT CMAKE_SYSTEM_NAME MATCHES "Windows")
@@ -152,11 +157,6 @@ if ( CMAKE_SYSTEM_NAME MATCHES "Windows"
@@ -155,11 +160,6 @@ if ( CMAKE_SYSTEM_NAME MATCHES "Windows"
if (MSVC AND NOT LLDB_DISABLE_PYTHON)
target_link_libraries(liblldb PRIVATE ${PYTHON_LIBRARY})
endif()

View File

@ -1,20 +1,18 @@
Index: llvm-toolchain-snapshot_9~svn362241/lldb/tools/argdumper/CMakeLists.txt
Index: llvm-toolchain-snapshot_9~svn365742/lldb/tools/argdumper/CMakeLists.txt
===================================================================
--- llvm-toolchain-snapshot_9~svn362241.orig/lldb/tools/argdumper/CMakeLists.txt
+++ llvm-toolchain-snapshot_9~svn362241/lldb/tools/argdumper/CMakeLists.txt
@@ -8,3 +8,8 @@ add_lldb_tool(lldb-argdumper
if(LLDB_BUILD_FRAMEWORK)
lldb_add_to_framework(lldb-argdumper)
endif()
--- llvm-toolchain-snapshot_9~svn365742.orig/lldb/tools/argdumper/CMakeLists.txt
+++ llvm-toolchain-snapshot_9~svn365742/lldb/tools/argdumper/CMakeLists.txt
@@ -4,3 +4,6 @@ add_lldb_tool(lldb-argdumper ADD_TO_FRAM
LINK_LIBS
lldbUtility
)
+
+install(TARGETS lldb-argdumper
+ RUNTIME DESTINATION bin)
+
+
Index: llvm-toolchain-snapshot_9~svn362241/lldb/tools/lldb-server/CMakeLists.txt
Index: llvm-toolchain-snapshot_9~svn365742/lldb/tools/lldb-server/CMakeLists.txt
===================================================================
--- llvm-toolchain-snapshot_9~svn362241.orig/lldb/tools/lldb-server/CMakeLists.txt
+++ llvm-toolchain-snapshot_9~svn362241/lldb/tools/lldb-server/CMakeLists.txt
--- llvm-toolchain-snapshot_9~svn365742.orig/lldb/tools/lldb-server/CMakeLists.txt
+++ llvm-toolchain-snapshot_9~svn365742/lldb/tools/lldb-server/CMakeLists.txt
@@ -77,3 +77,7 @@ add_lldb_tool(lldb-server
)