rebase of the patch

This commit is contained in:
Sylvestre Ledru 2017-01-27 09:18:28 +00:00
parent 515e8931a5
commit a556c23249

View File

@ -1,8 +1,8 @@
diff --git a/lldb/cmake/LLDBDependencies.cmake b/cmake/LLDBDependencies.cmake Index: llvm-toolchain-3.9-3.9.1/lldb/cmake/LLDBDependencies.cmake
index 67d110e0a..ee4f7a6e3 100644 ===================================================================
--- a/lldb.orig/cmake/LLDBDependencies.cmake --- llvm-toolchain-3.9-3.9.1.orig/lldb/cmake/LLDBDependencies.cmake
+++ b/lldb/cmake/LLDBDependencies.cmake +++ llvm-toolchain-3.9-3.9.1/lldb/cmake/LLDBDependencies.cmake
@@ -201,6 +201,7 @@ set(LLVM_LINK_COMPONENTS @@ -207,6 +207,7 @@ set(LLVM_LINK_COMPONENTS
option option
support support
coverage coverage
@ -10,10 +10,10 @@ index 67d110e0a..ee4f7a6e3 100644
) )
if ( NOT LLDB_DISABLE_PYTHON ) if ( NOT LLDB_DISABLE_PYTHON )
diff --git a/lldb/cmake/modules/AddLLDB.cmake b/cmake/modules/AddLLDB.cmake Index: llvm-toolchain-3.9-3.9.1/lldb/cmake/modules/AddLLDB.cmake
index af1605076..aa11a90d0 100644 ===================================================================
--- a/lldb.orig/cmake/modules/AddLLDB.cmake --- llvm-toolchain-3.9-3.9.1.orig/lldb/cmake/modules/AddLLDB.cmake
+++ b/lldb/cmake/modules/AddLLDB.cmake +++ llvm-toolchain-3.9-3.9.1/lldb/cmake/modules/AddLLDB.cmake
@@ -93,7 +93,7 @@ macro(add_lldb_library name) @@ -93,7 +93,7 @@ macro(add_lldb_library name)
endmacro(add_lldb_library) endmacro(add_lldb_library)
@ -23,10 +23,10 @@ index af1605076..aa11a90d0 100644
set_target_properties(${name} PROPERTIES FOLDER "lldb executables") set_target_properties(${name} PROPERTIES FOLDER "lldb executables")
endmacro(add_lldb_executable) endmacro(add_lldb_executable)
diff --git a/lldb/source/Plugins/SymbolFile/PDB/CMakeLists.txt b/source/Plugins/SymbolFile/PDB/CMakeLists.txt Index: llvm-toolchain-3.9-3.9.1/lldb/source/Plugins/SymbolFile/PDB/CMakeLists.txt
index 79d8a25d6..b22c928c5 100644 ===================================================================
--- a/lldb.orig/source/Plugins/SymbolFile/PDB/CMakeLists.txt --- llvm-toolchain-3.9-3.9.1.orig/lldb/source/Plugins/SymbolFile/PDB/CMakeLists.txt
+++ b/lldb/source/Plugins/SymbolFile/PDB/CMakeLists.txt +++ llvm-toolchain-3.9-3.9.1/lldb/source/Plugins/SymbolFile/PDB/CMakeLists.txt
@@ -1,6 +1,3 @@ @@ -1,6 +1,3 @@
-set(LLVM_PRIVATE_LINK_COMPONENTS -set(LLVM_PRIVATE_LINK_COMPONENTS
- DebugInfoPDB) - DebugInfoPDB)