[CMake] install-distribution support for swift-lldb on Darwin

apple-llvm-split-commit: 8fab08d6a138b1c6b26b2cd319b32d814f348225
apple-llvm-split-dir: lldb/

Author: weliveindetail

lldb/cmake/caches/Apple-lldb-macOS.cmake

@@ -27,4 +27,5 @@ set(LLVM_DISTRIBUTION_COMPONENTS
   lldb-argdumper
   darwin-debug
   debugserver
+  repl_swift
   CACHE STRING "")

lldb/cmake/modules/AddLLDB.cmake

@@ -220,19 +220,22 @@ function(lldb_add_post_install_steps_darwin name install_prefix)
   endif()
 
   # Generate dSYM in symroot
-  set(dsym_name ${output_name}.dSYM)
-  if(is_framework)
-    set(dsym_name ${output_name}.framework.dSYM)
-  endif()
-  if(LLDB_DEBUGINFO_INSTALL_PREFIX)
-    # This makes the path absolute, so we must respect DESTDIR.
-    set(dsym_name "\$ENV\{DESTDIR\}${LLDB_DEBUGINFO_INSTALL_PREFIX}/${dsym_name}")
-  endif()
+  # TODO: Add an option to skip dSYM creation
+  if(NOT ${name} STREQUAL "repl_swift")
+    set(dsym_name ${output_name}.dSYM)
+    if(is_framework)
+      set(dsym_name ${output_name}.framework.dSYM)
+    endif()
+    if(LLDB_DEBUGINFO_INSTALL_PREFIX)
+      # This makes the path absolute, so we must respect DESTDIR.
+      set(dsym_name "\$ENV\{DESTDIR\}${LLDB_DEBUGINFO_INSTALL_PREFIX}/${dsym_name}")
+    endif()
 
-  set(buildtree_name ${buildtree_dir}/${bundle_subdir}${output_name})
-  install(CODE "message(STATUS \"Externalize debuginfo: ${dsym_name}\")" COMPONENT ${name})
-  install(CODE "execute_process(COMMAND xcrun dsymutil -o=${dsym_name} ${buildtree_name})"
-          COMPONENT ${name})
+    set(buildtree_name ${buildtree_dir}/${bundle_subdir}${output_name})
+    install(CODE "message(STATUS \"Externalize debuginfo: ${dsym_name}\")" COMPONENT ${name})
+    install(CODE "execute_process(COMMAND xcrun dsymutil -o=${dsym_name} ${buildtree_name})"
+            COMPONENT ${name})
+  endif()
 
   # Strip distribution binary with -ST (removing debug symbol table entries and
   # Swift symbols). Avoid CMAKE_INSTALL_DO_STRIP and llvm_externalize_debuginfo()

lldb/tools/repl/swift/CMakeLists.txt

@@ -1,10 +1,5 @@
 # Set the correct rpath to locate libswiftCore.
-if (LLDB_BUILD_FRAMEWORK)
-  get_target_property(framework_target_dir liblldb LIBRARY_OUTPUT_DIRECTORY)
-  set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-rpath \
-      -Wl,${framework_target_dir}/LLDB.framework/Versions/${LLDB_FRAMEWORK_VERSION}/Resources/Swift/macosx")
-elseif( CMAKE_SYSTEM_NAME MATCHES "Linux" )
-  # Set the correct rpath to locate libswiftCore
+if( CMAKE_SYSTEM_NAME MATCHES "Linux" )
   if (CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "ppc64le")
     set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} \
         -Wl,-rpath,${CMAKE_BINARY_DIR}/../swift-linux-powerpc64le/lib${LLVM_LIBDIR_SUFFIX}/swift/linux/powerpc64le")
@@ -15,7 +10,13 @@ elseif( CMAKE_SYSTEM_NAME MATCHES "Linux" )
   set(CMAKE_INSTALL_RPATH "$ORIGIN/../lib/swift/linux:${CMAKE_INSTALL_RPATH}")
 endif()
 
-add_lldb_tool(repl_swift
+# Override locally, so the repl is ad-hoc signed.
+set(LLVM_CODESIGNING_IDENTITY "-")
+
+# Requires system-provided Swift libs.
+set(CMAKE_OSX_DEPLOYMENT_TARGET 10.14.4)
+
+add_lldb_tool(repl_swift ADD_TO_FRAMEWORK
   main.c
   )
 target_link_libraries(repl_swift PRIVATE ${CMAKE_DL_LIBS})
@@ -24,10 +25,6 @@ if(CMAKE_SYSTEM_NAME STREQUAL Windows)
     WIN32_EXECUTABLE TRUE)
 endif()
 
-if(LLDB_BUILD_FRAMEWORK)
-  lldb_add_to_framework(repl_swift)
-endif()
-
 # The dummy repl executable is a C program, but we always look for a mangled
 # swift symbol (corresponding to main). If we build the repl with debug info,
 # the debugger looks at the frame language (looking up the compile unit) and gets
@@ -40,3 +37,25 @@ else()
   set_target_properties(repl_swift PROPERTIES
       COMPILE_FLAGS "-g0")
 endif()
+
+if(APPLE)
+  # Set the RPATHs to locate libswiftCore. Prefer the just-built one.
+  set(swift_buildtree ${LLDB_PATH_TO_SWIFT_BUILD}/lib/swift/macosx)
+  set(system_libs /usr/lib/swift)
+
+  if(LLDB_BUILD_FRAMEWORK)
+    get_target_property(framework_build_dir liblldb LIBRARY_OUTPUT_DIRECTORY)
+    set(lldb_buildtree {framework_build_dir}/LLDB.framework/Versions/${LLDB_FRAMEWORK_VERSION}/Resources/Swift/macosx)
+    set(lldb_installtree Swift/macosx) # repl_swift is installed to framework Resources
+  endif()
+
+  lldb_setup_rpaths(repl_swift
+    BUILD_RPATH
+      ${swift_buildtree}
+      ${lldb_buildtree}
+      ${system_libs}
+    INSTALL_RPATH
+      ${lldb_installtree}
+      ${system_libs}
+  )
+endif()