Ismail Dönmez
2014-09-04 16:35:33 +00:00
committed by Git OBS Bridge
parent 22d6607fca
commit 2961939ca1
2 changed files with 15 additions and 15 deletions

View File

@@ -1,7 +1,7 @@
Index: llvm/tools/lldb/source/CMakeLists.txt
Index: lldb/source/CMakeLists.txt
===================================================================
--- llvm.orig/tools/lldb/source/CMakeLists.txt
+++ llvm/tools/lldb/source/CMakeLists.txt
--- lldb/source/CMakeLists.txt
+++ lldb/source/CMakeLists.txt
@@ -342,5 +342,5 @@ endif ()
install(TARGETS liblldb
@@ -10,10 +10,10 @@ Index: llvm/tools/lldb/source/CMakeLists.txt
- ARCHIVE DESTINATION lib)
+ LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX}
+ ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX})
Index: llvm/tools/lldb/scripts/Python/modules/readline/CMakeLists.txt
Index: lldb/scripts/Python/modules/readline/CMakeLists.txt
===================================================================
--- llvm.orig/tools/lldb/scripts/Python/modules/readline/CMakeLists.txt
+++ llvm/tools/lldb/scripts/Python/modules/readline/CMakeLists.txt
--- lldb/scripts/Python/modules/readline/CMakeLists.txt
+++ lldb/scripts/Python/modules/readline/CMakeLists.txt
@@ -13,7 +13,7 @@ add_library(readline SHARED readline.cpp
# python finds it when loading the python readline module.
set_target_properties(readline PROPERTIES
@@ -24,10 +24,10 @@ Index: llvm/tools/lldb/scripts/Python/modules/readline/CMakeLists.txt
# Install the readline module.
-install(TARGETS readline LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/${PYTHON_DIRECTORY})
+install(TARGETS readline LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LLVM_LIBDIR_SUFFIX}/${PYTHON_DIRECTORY})
Index: llvm/tools/lldb/source/lldb.cpp
Index: lldb/source/lldb.cpp
===================================================================
--- llvm.orig/tools/lldb/source/lldb.cpp
+++ llvm/tools/lldb/source/lldb.cpp
--- lldb/source/lldb.cpp
+++ lldb/source/lldb.cpp
@@ -287,11 +287,7 @@ extern "C" const unsigned char liblldb_c
static const char *
GetLLDBRevision()
@@ -40,10 +40,10 @@ Index: llvm/tools/lldb/source/lldb.cpp
}
static const char *
Index: llvm/tools/lldb/source/Core/IOHandler.cpp
Index: lldb/source/Core/IOHandler.cpp
===================================================================
--- llvm.orig/tools/lldb/source/Core/IOHandler.cpp
+++ llvm/tools/lldb/source/Core/IOHandler.cpp
--- lldb/source/Core/IOHandler.cpp
+++ lldb/source/Core/IOHandler.cpp
@@ -29,8 +29,8 @@
#include "lldb/Target/ThreadPlan.h"