rebase of the patch

This commit is contained in:
Sylvestre Ledru 2020-08-12 08:59:22 +02:00
parent f5c15e78bd
commit 53a1f59282
2 changed files with 10 additions and 10 deletions

View File

@ -2,12 +2,12 @@
lldb/source/API/CMakeLists.txt | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
Index: llvm-toolchain-snapshot_11~++20200326111000+4673699a470/lldb/source/API/CMakeLists.txt
Index: llvm-toolchain-snapshot_12~++20200812084744+2ad7e1a301f/lldb/source/API/CMakeLists.txt
===================================================================
--- llvm-toolchain-snapshot_11~++20200326111000+4673699a470.orig/lldb/source/API/CMakeLists.txt
+++ llvm-toolchain-snapshot_11~++20200326111000+4673699a470/lldb/source/API/CMakeLists.txt
@@ -19,7 +19,12 @@ if(LLDB_BUILD_FRAMEWORK)
set(option_framework FRAMEWORK)
--- llvm-toolchain-snapshot_12~++20200812084744+2ad7e1a301f.orig/lldb/source/API/CMakeLists.txt
+++ llvm-toolchain-snapshot_12~++20200812084744+2ad7e1a301f/lldb/source/API/CMakeLists.txt
@@ -19,7 +19,12 @@ if(LLDB_ENABLE_LUA)
set(lldb_lua_wrapper ${lua_bindings_dir}/LLDBWrapLua.cpp)
endif()
-add_lldb_library(liblldb SHARED ${option_framework}
@ -20,7 +20,7 @@ Index: llvm-toolchain-snapshot_11~++20200326111000+4673699a470/lldb/source/API/C
SBAddress.cpp
SBAttachInfo.cpp
SBBlock.cpp
@@ -160,7 +165,7 @@ endif()
@@ -163,7 +168,7 @@ endif()
set_target_properties(liblldb
PROPERTIES
@ -29,7 +29,7 @@ Index: llvm-toolchain-snapshot_11~++20200326111000+4673699a470/lldb/source/API/C
)
if (NOT CMAKE_SYSTEM_NAME MATCHES "Windows")
@@ -185,11 +190,6 @@ if ( CMAKE_SYSTEM_NAME MATCHES "Windows"
@@ -188,11 +193,6 @@ if ( CMAKE_SYSTEM_NAME MATCHES "Windows"
if (MSVC AND LLDB_ENABLE_PYTHON)
target_link_libraries(liblldb PRIVATE ${PYTHON_LIBRARIES})
endif()

View File

@ -1,7 +1,7 @@
Index: llvm-toolchain-snapshot_11~++20200326111000+4673699a470/lldb/bindings/python.swig
Index: llvm-toolchain-snapshot_12~++20200812084744+2ad7e1a301f/lldb/bindings/python/python.swig
===================================================================
--- llvm-toolchain-snapshot_11~++20200326111000+4673699a470.orig/lldb/bindings/python.swig
+++ llvm-toolchain-snapshot_11~++20200326111000+4673699a470/lldb/bindings/python.swig
--- llvm-toolchain-snapshot_12~++20200812084744+2ad7e1a301f.orig/lldb/bindings/python/python.swig
+++ llvm-toolchain-snapshot_12~++20200812084744+2ad7e1a301f/lldb/bindings/python/python.swig
@@ -50,7 +50,7 @@ except ImportError:
%enddef
// These versions will not generate working python modules, so error out early.