[OCaml] Install dynamic libraries in 'stubdirs' directory

[mgorny]

Summary

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.

[whitequark]

Otherwise, the executables fail to run being unable to locate
the libraries (unless the LLVM directory is explicitly added to
LD_LIBRARY_PATH).

Do you mean CAML_LD_LIBRARY_PATH?

[mgorny]

I suppose both should work but I only tested with plain LD_LIBRARY_PATH.

[jpdeplaix]

Is it possible to backport this to the 5.0 branch ?

[mgorny]

https://bugs.llvm.org/show_bug.cgi?id=33987 now open for that purpose.

llvm/trunk/cmake/modules/AddOCaml.cmake

function(add_ocaml_library name)
   endforeach()
 
   install(FILES ${install_files}
           DESTINATION "${LLVM_OCAML_INSTALL_PATH}/llvm")
   install(FILES ${install_shlibs}
           PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE
                       GROUP_READ GROUP_EXECUTE
                       WORLD_READ WORLD_EXECUTE
-          DESTINATION "${LLVM_OCAML_INSTALL_PATH}/llvm")
+          DESTINATION "${LLVM_OCAML_INSTALL_PATH}/stublibs")
 
   foreach( install_file ${install_files} ${install_shlibs} )
     get_filename_component(filename "${install_file}" NAME)
     add_custom_command(TARGET "ocaml_${name}" POST_BUILD
       COMMAND "${CMAKE_COMMAND}" "-E" "copy" "${install_file}"
                                              "${LLVM_LIBRARY_DIR}/ocaml/llvm/"
       COMMENT "Copying OCaml library component ${filename} to intermediate area"
       VERBATIM)
     add_dependencies("ocaml_${name}" ocaml_make_directory)
   endforeach()
 endfunction()
 
 add_custom_target(ocaml_make_directory
   COMMAND "${CMAKE_COMMAND}" "-E" "make_directory" "${LLVM_LIBRARY_DIR}/ocaml/llvm")
 add_custom_target("ocaml_all")
 set_target_properties(ocaml_all PROPERTIES FOLDER "Misc")