rebase of the patch

This commit is contained in:
Sylvestre Ledru 2019-11-13 10:39:37 +01:00
parent 90df1d2a3f
commit 98ec7d068d

View File

@ -2,15 +2,15 @@
lldb/source/API/CMakeLists.txt | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
Index: llvm-toolchain-snapshot_10~+20191020075550+5b8546023f3/lldb/source/API/CMakeLists.txt
Index: llvm-toolchain-snapshot_10~+20191113090841+5b9e4daef06/lldb/source/API/CMakeLists.txt
===================================================================
--- llvm-toolchain-snapshot_10~+20191020075550+5b8546023f3.orig/lldb/source/API/CMakeLists.txt
+++ llvm-toolchain-snapshot_10~+20191020075550+5b8546023f3/lldb/source/API/CMakeLists.txt
@@ -13,7 +13,12 @@ if(LLDB_BUILD_FRAMEWORK)
set(option_install_prefix INSTALL_PREFIX ${LLDB_FRAMEWORK_INSTALL_DIR})
--- llvm-toolchain-snapshot_10~+20191113090841+5b9e4daef06.orig/lldb/source/API/CMakeLists.txt
+++ llvm-toolchain-snapshot_10~+20191113090841+5b9e4daef06/lldb/source/API/CMakeLists.txt
@@ -14,7 +14,12 @@ if(LLDB_BUILD_FRAMEWORK)
set(option_framework FRAMEWORK)
endif()
-add_lldb_library(liblldb SHARED
-add_lldb_library(liblldb SHARED ${option_framework}
+set(output_name lldb)
+if (CMAKE_SYSTEM_NAME MATCHES "Windows")
+ set(output_name liblldb)
@ -20,7 +20,7 @@ Index: llvm-toolchain-snapshot_10~+20191020075550+5b8546023f3/lldb/source/API/CM
SBAddress.cpp
SBAttachInfo.cpp
SBBlock.cpp
@@ -131,7 +136,7 @@ endif()
@@ -132,7 +137,7 @@ endif()
set_target_properties(liblldb
PROPERTIES
@ -29,7 +29,7 @@ Index: llvm-toolchain-snapshot_10~+20191020075550+5b8546023f3/lldb/source/API/CM
)
if (NOT CMAKE_SYSTEM_NAME MATCHES "Windows")
@@ -156,11 +161,6 @@ if ( CMAKE_SYSTEM_NAME MATCHES "Windows"
@@ -157,11 +162,6 @@ if ( CMAKE_SYSTEM_NAME MATCHES "Windows"
if (MSVC AND NOT LLDB_DISABLE_PYTHON)
target_link_libraries(liblldb PRIVATE ${PYTHON_LIBRARY})
endif()