[PATCH] D55012: [CMake] Streamline code signing for debugserver #2

[Stefan Gränitz via Phabricator via llvm-commits]

sgraenitz updated this revision to Diff 175725.
sgraenitz added a comment.

Fix target directory for debugserver: it must not be LLVM_TOOLS_BINARY_DIR but LLVM_RUNTIME_OUTPUT_INTDIR. It's a difference in standalone builds of LLDB. LLVM_TOOLS_BINARY_DIR was wrong here as it points to the binary directory in the detached LLVM build tree. It should make no difference for in-tree builds.


CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D55012/new/

https://reviews.llvm.org/D55012

Files:
  tools/debugserver/source/CMakeLists.txt


Index: tools/debugserver/source/CMakeLists.txt
===================================================================
--- tools/debugserver/source/CMakeLists.txt
+++ tools/debugserver/source/CMakeLists.txt
@@ -156,7 +156,7 @@
 # because the value of DEBUGSERVER_PATH is used to build LLDB_DOTEST_ARGS,
 # which is used for configuring lldb-dotest.in, which does not have a generator
 # step at the moment.
-set(default_debugserver_path "${LLVM_TOOLS_BINARY_DIR}/debugserver${CMAKE_EXECUTABLE_SUFFIX}")
+set(default_debugserver_path "${LLVM_RUNTIME_OUTPUT_INTDIR}/debugserver${CMAKE_EXECUTABLE_SUFFIX}")
 
 # Remember where debugserver binary goes and whether or not we have to test it.
 set(DEBUGSERVER_PATH "" CACHE FILEPATH "Path to debugserver")
@@ -166,7 +166,7 @@
 if(use_system_debugserver)
   add_custom_target(debugserver
     COMMAND ${CMAKE_COMMAND} -E copy_if_different
-            ${system_debugserver} ${LLVM_TOOLS_BINARY_DIR}
+            ${system_debugserver} ${LLVM_RUNTIME_OUTPUT_INTDIR}
     COMMENT "Copying the system debugserver to LLDB's binaries directory.")
 
   # Don't test debugserver itself.


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D55012.175725.patch
Type: text/x-patch
Size: 1118 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20181128/538c577c/attachment.bin>