Skip to content
This repository was archived by the owner on Feb 5, 2019. It is now read-only.

Commit 2f5b5ca

Browse files
committed
Merging r309481:
------------------------------------------------------------------------ r309481 | mgorny | 2017-07-28 23:46:45 -0700 (Fri, 28 Jul 2017) | 13 lines [OCaml] Install dynamic libraries in 'stubdirs' directory Install the OCaml dynamic libraries in the 'stubdirs' directory rather than the llvm subdirectory in order to fix running executables created by ocamlc. Otherwise, the executables fail to run being unable to locate the libraries (unless the LLVM directory is explicitly added to LD_LIBRARY_PATH). The staging directories are not altered since they work for our development setup anyway, and installing into two directories would unnecessarily make the code more complex. Differential Revision: https://reviews.llvm.org/D35995 ------------------------------------------------------------------------ git-svn-id: https://llvm.org/svn/llvm-project/llvm/branches/release_50@309592 91177308-0d34-0410-b5e6-96231b3b80d8
1 parent e44c13d commit 2f5b5ca

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

cmake/modules/AddOCaml.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ function(add_ocaml_library name)
204204
PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE
205205
GROUP_READ GROUP_EXECUTE
206206
WORLD_READ WORLD_EXECUTE
207-
DESTINATION "${LLVM_OCAML_INSTALL_PATH}/llvm")
207+
DESTINATION "${LLVM_OCAML_INSTALL_PATH}/stublibs")
208208

209209
foreach( install_file ${install_files} ${install_shlibs} )
210210
get_filename_component(filename "${install_file}" NAME)

0 commit comments

Comments
 (0)