Merge commit '31ea714e9a94' from llvm.org/master into apple/master

git apple-llvm automerger · git apple-llvm automerger · commit a1d5101a678f · 2019-11-11T19:23:10.000-08:00
diff --git a/lldb/cmake/modules/LLDBFramework.cmake b/lldb/cmake/modules/LLDBFramework.cmake
@@ -120,3 +120,8 @@ if(NOT IOS)
     COMMENT "LLDB.framework: copy clang vendor-specific headers"
   )
 endif()
+
+# Add an rpath pointing to the directory where LLDB.framework is installed.
+# This allows frameworks (relying on @rpath) to be installed in the same folder and found at runtime.
+set_property(TARGET liblldb APPEND PROPERTY INSTALL_RPATH
+  "@loader_path/../../../")

Original file line number	Diff line number	Diff line change
`@@ -120,3 +120,8 @@ if(NOT IOS)`
`120`	`120`	`COMMENT "LLDB.framework: copy clang vendor-specific headers"`
`121`	`121`	`)`
`122`	`122`	`endif()`
	`123`	`+`
	`124`	`+# Add an rpath pointing to the directory where LLDB.framework is installed.`
	`125`	`+# This allows frameworks (relying on @rpath) to be installed in the same folder and found at runtime.`
	`126`	`+set_property(TARGET liblldb APPEND PROPERTY INSTALL_RPATH`
	`127`	`+ "@loader_path/../../../")`