Skip to content

Commit 910b5f1

Browse files
committed
Fix crash when using LLDB adapter on Windows in free version. Fix #566.
1 parent 1435c6b commit 910b5f1

File tree

1 file changed

+8
-22
lines changed

1 file changed

+8
-22
lines changed

core/CMakeLists.txt

Lines changed: 8 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -175,28 +175,14 @@ else()
175175
find_library(lib_lldb NAMES liblldb PATHS ${LLDB_PATH}/lib REQUIRED)
176176
target_link_libraries(debuggercore ${lib_lldb})
177177
target_include_directories(debuggercore PRIVATE ${LLDB_PATH}/include)
178-
if(NOT DEMO)
179-
add_custom_command(TARGET debuggercore PRE_LINK
180-
COMMAND ${CMAKE_COMMAND} -E echo "Copying LLDB Libs"
181-
COMMAND ${CMAKE_COMMAND} -E make_directory ${LIBRARY_OUTPUT_DIRECTORY_PATH}/lldb
182-
COMMAND ${CMAKE_COMMAND} -E copy ${LLDB_PATH}/bin/lldb.exe ${LIBRARY_OUTPUT_DIRECTORY_PATH}/lldb
183-
COMMAND ${CMAKE_COMMAND} -E copy ${LLDB_PATH}/bin/lldb-server.exe ${LIBRARY_OUTPUT_DIRECTORY_PATH}/lldb
184-
COMMAND ${CMAKE_COMMAND} -E copy ${LLDB_PATH}/bin/lldb-argdumper.exe ${LIBRARY_OUTPUT_DIRECTORY_PATH}/lldb
185-
COMMAND ${CMAKE_COMMAND} -E copy ${LLDB_PATH}/bin/liblldb.dll ${LIBRARY_OUTPUT_DIRECTORY_PATH}
186-
)
187-
else()
188-
# On Windows, there is no rpath, so we must put the liblldb.dll in the same folder as binaryninja.exe.
189-
# This is NOT needed for non-demo builds, because the debuggercore and the liblldb.dll are both in the
190-
# plugins folder.
191-
add_custom_command(TARGET debuggercore PRE_LINK
192-
COMMAND ${CMAKE_COMMAND} -E echo "Copying LLDB Libs"
193-
COMMAND ${CMAKE_COMMAND} -E make_directory ${BN_CORE_OUTPUT_DIR}/lldb
194-
COMMAND ${CMAKE_COMMAND} -E copy ${LLDB_PATH}/bin/lldb.exe ${BN_CORE_OUTPUT_DIR}/lldb
195-
COMMAND ${CMAKE_COMMAND} -E copy ${LLDB_PATH}/bin/lldb-server.exe ${BN_BINARY_DIR}/lldb
196-
COMMAND ${CMAKE_COMMAND} -E copy ${LLDB_PATH}/bin/lldb-argdumper.exe ${BN_CORE_OUTPUT_DIR}/lldb
197-
COMMAND ${CMAKE_COMMAND} -E copy ${LLDB_PATH}/bin/liblldb.dll ${BN_CORE_OUTPUT_DIR}
198-
)
199-
endif()
178+
add_custom_command(TARGET debuggercore PRE_LINK
179+
COMMAND ${CMAKE_COMMAND} -E echo "Copying LLDB Libs"
180+
COMMAND ${CMAKE_COMMAND} -E make_directory ${LIBRARY_OUTPUT_DIRECTORY_PATH}/lldb
181+
COMMAND ${CMAKE_COMMAND} -E copy ${LLDB_PATH}/bin/lldb.exe ${LIBRARY_OUTPUT_DIRECTORY_PATH}/lldb
182+
COMMAND ${CMAKE_COMMAND} -E copy ${LLDB_PATH}/bin/lldb-server.exe ${LIBRARY_OUTPUT_DIRECTORY_PATH}/lldb
183+
COMMAND ${CMAKE_COMMAND} -E copy ${LLDB_PATH}/bin/lldb-argdumper.exe ${LIBRARY_OUTPUT_DIRECTORY_PATH}/lldb
184+
COMMAND ${CMAKE_COMMAND} -E copy ${LLDB_PATH}/bin/liblldb.dll ${LIBRARY_OUTPUT_DIRECTORY_PATH}
185+
)
200186
endif()
201187

202188
if (WIN32)

0 commit comments

Comments
 (0)