diff options
| author | Michal Gorny <mgorny@gentoo.org> | 2016-09-30 18:34:23 +0000 |
|---|---|---|
| committer | Michal Gorny <mgorny@gentoo.org> | 2016-09-30 18:34:23 +0000 |
| commit | a7d748bbd354190b67801a68cba442c2590ca8e1 (patch) | |
| tree | 68205447e84f4c25221a98a42fb9b8cb0ef2629b /bindings/ocaml/llvm/META.llvm.in | |
| parent | 9faad5871fb7c385f5f49eada8889f638ccc9795 (diff) | |
cmake: Install the OCaml libraries into a more correct path
Add a OCAML_INSTALL_PATH variable that can be used to control
the install path for OCaml libraries. The new variable defaults to
${OCAML_STDLIB_PATH}, i.e. the OCaml library path obtained from
the OCaml compiler. Install libraries into "llvm" subdirectory.
This fixes two issues:
1. OCaml library directories differ between systems, and 'lib/ocaml' is
incorrect e.g. on amd64 Gentoo where OCaml is installed
in 'lib64/ocaml'. Therefore, obtain the library path from the OCaml
compiler using 'ocamlc -where' (which is already used to set
OCAML_STDLIB_PATH), which is the method used commonly in OCaml packages.
2. The top-level directory is reserved for the standard library, and has
precedence over local directory in search path. As a result, OCaml
preferred the files installed along with previous LLVM version over the
source tree when building a new version, resulting in two versions being
mixed during the build. The new layout is used commonly by other OCaml
packages, and findlib is able to find the LLVM libraries successfully.
Bug: https://bugs.gentoo.org/559134
Bug: https://bugs.gentoo.org/559624
Differential Revision: https://reviews.llvm.org/D24354
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@282895 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'bindings/ocaml/llvm/META.llvm.in')
| -rw-r--r-- | bindings/ocaml/llvm/META.llvm.in | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/bindings/ocaml/llvm/META.llvm.in b/bindings/ocaml/llvm/META.llvm.in index 92896e387a6c..adafd788ebf4 100644 --- a/bindings/ocaml/llvm/META.llvm.in +++ b/bindings/ocaml/llvm/META.llvm.in @@ -3,7 +3,7 @@ version = "@PACKAGE_VERSION@" description = "LLVM OCaml bindings" archive(byte) = "llvm.cma" archive(native) = "llvm.cmxa" -directory = "." +directory = "llvm" package "analysis" ( requires = "llvm" |