summaryrefslogtreecommitdiffstats
path: root/llvm
diff options
context:
space:
mode:
authorMichal Gorny <mgorny@gentoo.org>2017-07-29 06:46:45 +0000
committerMichal Gorny <mgorny@gentoo.org>2017-07-29 06:46:45 +0000
commitcc2eccdf5032c4ea3490df58111722d78e2b8c3a (patch)
tree50ea598fcebcc1002a4b7585f9177e479588c412 /llvm
parentb5a968f62d4f2802ff54051c6c5d884546539347 (diff)
downloadbcm5719-llvm-cc2eccdf5032c4ea3490df58111722d78e2b8c3a.tar.gz
bcm5719-llvm-cc2eccdf5032c4ea3490df58111722d78e2b8c3a.zip
[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 llvm-svn: 309481
Diffstat (limited to 'llvm')
-rw-r--r--llvm/cmake/modules/AddOCaml.cmake2
1 files changed, 1 insertions, 1 deletions
diff --git a/llvm/cmake/modules/AddOCaml.cmake b/llvm/cmake/modules/AddOCaml.cmake
index 1b805c0710a..ef9c8ec6e60 100644
--- a/llvm/cmake/modules/AddOCaml.cmake
+++ b/llvm/cmake/modules/AddOCaml.cmake
@@ -199,7 +199,7 @@ function(add_ocaml_library name)
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)
OpenPOWER on IntegriCloud