diff options
| author | Jonas Devlieghere <jonas@devlieghere.com> | 2019-09-24 22:39:04 +0000 |
|---|---|---|
| committer | Jonas Devlieghere <jonas@devlieghere.com> | 2019-09-24 22:39:04 +0000 |
| commit | cb4cda2d45e15aa01d3deb1e8779d2b0a22133e0 (patch) | |
| tree | 46a7e1793644d960cc35750d15db8e455a587613 /lldb/tools/debugserver/source | |
| parent | 1487bf6c82a88ff3342031b6ef82415377290ad1 (diff) | |
| download | bcm5719-llvm-cb4cda2d45e15aa01d3deb1e8779d2b0a22133e0.tar.gz bcm5719-llvm-cb4cda2d45e15aa01d3deb1e8779d2b0a22133e0.zip | |
[CMake] Copy over the system debugserver when using LLDB_USE_SYSTEM_DEBUGSERVER
r366433 broke support for the system debugserver. Although the change
was well-intended, it (presumably) unintentionally removed the logic to
copy over the debugserver. As a result, even with
LLDB_USE_SYSTEM_DEBUGSERVER enabled, we ended up building, signing and
using the just-built debugserver.
This patch partially recovers the old behavior: when
LLDB_USE_SYSTEM_DEBUGSERVER is set we don't build debugserver and just
copy over the system one.
Differential revision: https://reviews.llvm.org/D67991
llvm-svn: 372786
Diffstat (limited to 'lldb/tools/debugserver/source')
| -rw-r--r-- | lldb/tools/debugserver/source/CMakeLists.txt | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/lldb/tools/debugserver/source/CMakeLists.txt b/lldb/tools/debugserver/source/CMakeLists.txt index aea8bb5d8e6..cfb46817e6d 100644 --- a/lldb/tools/debugserver/source/CMakeLists.txt +++ b/lldb/tools/debugserver/source/CMakeLists.txt @@ -28,7 +28,7 @@ function(get_debugserver_codesign_identity result) if(LLDB_CODESIGN_IDENTITY) set(${result} ${LLDB_CODESIGN_IDENTITY} PARENT_SCOPE) check_certificate(${LLDB_CODESIGN_IDENTITY} available) - if(NOT available AND NOT LLDB_USE_SYSTEM_DEBUGSERVER) + if(NOT available) message(WARNING "LLDB_CODESIGN_IDENTITY not found: '${LLDB_CODESIGN_IDENTITY}' ${not_found_help}") endif() return() @@ -41,9 +41,7 @@ function(get_debugserver_codesign_identity result) return() endif() - if(NOT LLDB_USE_SYSTEM_DEBUGSERVER) - message(WARNING "Development code sign identiy not found: 'lldb_codesign' ${not_found_help}") - endif() + message(WARNING "Development code sign identiy not found: 'lldb_codesign' ${not_found_help}") # LLVM pendant: fallback if available if(LLVM_CODESIGNING_IDENTITY) |
