diff options
| author | Gordon Henriksen <gordonhenriksen@mac.com> | 2007-10-02 16:42:10 +0000 |
|---|---|---|
| committer | Gordon Henriksen <gordonhenriksen@mac.com> | 2007-10-02 16:42:10 +0000 |
| commit | 1d4e0782ba9761e3c664de53b837b74c0c818ff1 (patch) | |
| tree | 020d6dea130822d89cc565771cb962b95312873b /bindings/ocaml | |
| parent | bae4adc7de3a43c31100da6996912e30889aa2b9 (diff) | |
Providing --with-ocaml-libdir for ./configure. The default is the
stdlib if it's beneath --prefix, and is libdir/ocaml otherwise.
If someone has a better way than this to test whether $B is a path
within $A, I'd love to hear it:
if test "$A" \< "$B" -a "$B" \< "${A}~"
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@42532 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'bindings/ocaml')
| -rw-r--r-- | bindings/ocaml/Makefile.ocaml | 8 | ||||
| -rw-r--r-- | bindings/ocaml/bitwriter/llvm_bitwriter.mli | 2 |
2 files changed, 2 insertions, 8 deletions
diff --git a/bindings/ocaml/Makefile.ocaml b/bindings/ocaml/Makefile.ocaml index 8ad085ecad..b157c3194e 100644 --- a/bindings/ocaml/Makefile.ocaml +++ b/bindings/ocaml/Makefile.ocaml @@ -14,12 +14,6 @@ include $(LEVEL)/Makefile.config -# Find the ocaml stdlib root. /usr/local/lib/ocaml is the default when built -# from source; distros use something like /usr/lib/ocaml/3.10.0. -ifndef OCAML_LIBDIR -OCAML_LIBDIR := $(shell $(OCAMLC) -where) -endif - # CFLAGS needs to be set before Makefile.rules is included. Yes, ocaml puts its # includes under its libdir. CFLAGS += -I$(OCAML_LIBDIR) @@ -27,7 +21,7 @@ CFLAGS += -I$(OCAML_LIBDIR) include $(LEVEL)/Makefile.common # Intentionally ignore PROJ_prefix here. We want the ocaml stdlib. However, the -# user can override this with OCAML_LIBDIR. +# user can override this with OCAML_LIBDIR or configure --with-ocaml-libdir=. PROJ_libocamldir := $(DESTDIR)$(OCAML_LIBDIR) OcamlDir := $(LibDir)/ocaml diff --git a/bindings/ocaml/bitwriter/llvm_bitwriter.mli b/bindings/ocaml/bitwriter/llvm_bitwriter.mli index 3b7c6d4958..08e001bc91 100644 --- a/bindings/ocaml/bitwriter/llvm_bitwriter.mli +++ b/bindings/ocaml/bitwriter/llvm_bitwriter.mli @@ -8,7 +8,7 @@ *===----------------------------------------------------------------------=== * * This interface provides an ocaml API for the LLVM bitcode writer, the - * classes in the classes in the Bitwriter library. + * classes in the Bitwriter library. * *===----------------------------------------------------------------------===*) |