diff options
author | Todd Fiala <todd.fiala@gmail.com> | 2014-10-02 16:59:30 +0000 |
---|---|---|
committer | Todd Fiala <todd.fiala@gmail.com> | 2014-10-02 16:59:30 +0000 |
commit | eeb023cf76bb6a1f47b9bdcae7affe46dcdf5c8a (patch) | |
tree | f5c16a17ed5a845905666915553dcc0a81163734 | |
parent | 01c21e8f453c3b1b5dbbacd17ea6dfcf45adb2b0 (diff) | |
download | bcm5719-llvm-eeb023cf76bb6a1f47b9bdcae7affe46dcdf5c8a.tar.gz bcm5719-llvm-eeb023cf76bb6a1f47b9bdcae7affe46dcdf5c8a.zip |
Fix codesigning of MacOSX debugserver when built with cmake.
This patch fixes the codesigning of debugserver on OSX when built with
cmake. Without this you get this error when debugging:
error: process launch failed: unable to locate debugserver
Note: you also need to set LLDB_DEBUGSERVER_PATH to point to your built debugserver.
e.g. export LLDB_DEBUGSERVER_PATH=`pwd`/bin/debugserver
Change by dawn@burble.org.
Tested on MacOSX 10.9.5 and Xcode 6.1 Beta using cmake/ninja.
Verified no build break on Linux Ubuntu cmake/ninja and Xcode 6.1 canonical build.
llvm-svn: 218890
-rw-r--r-- | lldb/tools/debugserver/source/CMakeLists.txt | 2 | ||||
-rw-r--r-- | lldb/tools/debugserver/source/MacOSX/CMakeLists.txt | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/lldb/tools/debugserver/source/CMakeLists.txt b/lldb/tools/debugserver/source/CMakeLists.txt index 05d69831567..656beb8a33e 100644 --- a/lldb/tools/debugserver/source/CMakeLists.txt +++ b/lldb/tools/debugserver/source/CMakeLists.txt @@ -7,7 +7,7 @@ if (CMAKE_SYSTEM_NAME MATCHES "Darwin") include_directories(MacOSX) #include_directories(${CMAKE_CURRENT_BINARY_DIR}/MacOSX) - set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -stdlib=libc++") + set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -stdlib=libc++ -Wl,-sectcreate,__TEXT,__info_plist,${CMAKE_CURRENT_SOURCE_DIR}/../resources/lldb-debugserver-Info.plist") endif() add_definitions( diff --git a/lldb/tools/debugserver/source/MacOSX/CMakeLists.txt b/lldb/tools/debugserver/source/MacOSX/CMakeLists.txt index 58f9705fd09..559079e44b0 100644 --- a/lldb/tools/debugserver/source/MacOSX/CMakeLists.txt +++ b/lldb/tools/debugserver/source/MacOSX/CMakeLists.txt @@ -60,7 +60,9 @@ execute_process( ) add_custom_command(TARGET debugserver POST_BUILD - COMMAND CODESIGN_ALLOCATE=${CODESIGN_ALLOCATE} codesign --entitlements ${CMAKE_CURRENT_SOURCE_DIR}/../debugserver-entitlements.plist --force --sign ${CODESIGN_IDENTITY} debugserver + # --entitlements option removed, as it causes errors when debugging. + #was: COMMAND CODESIGN_ALLOCATE=${CODESIGN_ALLOCATE} codesign --entitlements ${CMAKE_CURRENT_SOURCE_DIR}/../debugserver-entitlements.plist --force --sign ${CODESIGN_IDENTITY} debugserver + COMMAND CODESIGN_ALLOCATE=${CODESIGN_ALLOCATE} codesign --force --sign ${CODESIGN_IDENTITY} debugserver WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/bin ) |