Index: CMakeLists.txt
===================================================================
--- CMakeLists.txt
+++ CMakeLists.txt
@@ -12,9 +12,11 @@
 include(AddLLDB)
 
 option(LLDB_USE_ENTITLEMENTS "When codesigning, use entitlements if available" ON)
+set(LLDB_CODESIGN_IDENTITY lldb_codesign CACHE STRING
+    "Identity for code signing debugserver (Darwin only)")
+
 if(LLDB_CODESIGN_IDENTITY)
-  # In the future we may use LLVM_CODESIGNING_IDENTITY directly.
-  set(LLVM_CODESIGNING_IDENTITY ${LLDB_CODESIGN_IDENTITY})
+  set(LLVM_CODESIGNING_IDENTITY ${LLDB_CODESIGN_IDENTITY} CACHE STRING "" FORCE)
 endif()
 
 # Define the LLDB_CONFIGURATION_xxx matching the build type
Index: tools/debugserver/CMakeLists.txt
===================================================================
--- tools/debugserver/CMakeLists.txt
+++ tools/debugserver/CMakeLists.txt
@@ -16,9 +16,11 @@
   include_directories(${LLDB_SOURCE_DIR}/include)
 
   option(LLDB_USE_ENTITLEMENTS "When codesigning, use entitlements if available" ON)
+  set(LLDB_CODESIGN_IDENTITY lldb_codesign CACHE STRING
+      "Identity for code signing debugserver (Darwin only)")
+
   if(LLDB_CODESIGN_IDENTITY)
-    # In the future we may use LLVM_CODESIGNING_IDENTITY directly.
-    set(LLVM_CODESIGNING_IDENTITY ${LLDB_CODESIGN_IDENTITY})
+    set(LLVM_CODESIGNING_IDENTITY ${LLDB_CODESIGN_IDENTITY} CACHE STRING "" FORCE)
   endif()
 endif()