This revision was not accepted when it landed; it landed in state "Needs Review". This revision was automatically updated to reflect the committed changes. Closed by commit rL364334: [CMake] Check that a certificate for lldb is present at build time. (authored by davide, committed by ). Herald added a project: LLVM. Herald added a subscriber: llvm-commits.
Changed prior to commit: https://reviews.llvm.org/D63745?vs=206475&id=206479#toc Repository: rL LLVM CHANGES SINCE LAST ACTION https://reviews.llvm.org/D63745/new/ https://reviews.llvm.org/D63745 Files: lldb/trunk/tools/debugserver/source/CMakeLists.txt Index: lldb/trunk/tools/debugserver/source/CMakeLists.txt =================================================================== --- lldb/trunk/tools/debugserver/source/CMakeLists.txt +++ lldb/trunk/tools/debugserver/source/CMakeLists.txt @@ -142,6 +142,21 @@ message(STATUS "lldb debugserver will not be available.") endif() +# On MacOS, debugserver needs to be codesigned when built. Check if we have +# a certificate instead of failing in the middle of the build. +if(build_and_sign_debugserver) + execute_process( + COMMAND security find-certificate -Z -p -c ${LLDB_CODESIGN_IDENTITY_USED} /Library/Keychains/System.keychain + RESULT_VARIABLE cert_return + OUTPUT_QUIET + ERROR_QUIET) + + if (cert_return) + message(FATAL_ERROR "Certificate for debugserver not found. Run scripts/macos-setup-codesign.sh or " + "use the system debugserver passing -DLLDB_USE_SYSTEM_DEBUGSERVER=ON to CMake") + endif() +endif() + if(APPLE) if(IOS) find_library(BACKBOARD_LIBRARY BackBoardServices
Index: lldb/trunk/tools/debugserver/source/CMakeLists.txt =================================================================== --- lldb/trunk/tools/debugserver/source/CMakeLists.txt +++ lldb/trunk/tools/debugserver/source/CMakeLists.txt @@ -142,6 +142,21 @@ message(STATUS "lldb debugserver will not be available.") endif() +# On MacOS, debugserver needs to be codesigned when built. Check if we have +# a certificate instead of failing in the middle of the build. +if(build_and_sign_debugserver) + execute_process( + COMMAND security find-certificate -Z -p -c ${LLDB_CODESIGN_IDENTITY_USED} /Library/Keychains/System.keychain + RESULT_VARIABLE cert_return + OUTPUT_QUIET + ERROR_QUIET) + + if (cert_return) + message(FATAL_ERROR "Certificate for debugserver not found. Run scripts/macos-setup-codesign.sh or " + "use the system debugserver passing -DLLDB_USE_SYSTEM_DEBUGSERVER=ON to CMake") + endif() +endif() + if(APPLE) if(IOS) find_library(BACKBOARD_LIBRARY BackBoardServices
_______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits