diff options
| author | Luc Maranget <luc.maranget@inria.fr> | 2014-03-13 15:25:35 +0000 |
|---|---|---|
| committer | Luc Maranget <luc.maranget@inria.fr> | 2014-03-13 15:25:35 +0000 |
| commit | 3853f0a4b0629197c00a5bdcd1ac8647e0ba714e (patch) | |
| tree | eecf2610d3eee5bf3d6f8f980ea84d7ca0884091 | |
| parent | 1f5876189e29730e9b8f40c2808d1d7b84a37af0 (diff) | |
| download | ocaml-jocamltrunk.tar.gz | |
Report jocaml related changes performed in jo401jocamltrunk
git-svn-id: http://caml.inria.fr/svn/ocaml/branches/jocamltrunk@14460 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
| -rw-r--r-- | bytecomp/dll.ml | 6 | ||||
| -rwxr-xr-x | byterun/Makefile.common | 1 |
2 files changed, 2 insertions, 5 deletions
diff --git a/bytecomp/dll.ml b/bytecomp/dll.ml index cdc4058900..3dc6eddf75 100644 --- a/bytecomp/dll.ml +++ b/bytecomp/dll.ml @@ -128,11 +128,7 @@ let read_ld_conf_contents dir = List.rev !path let ld_conf_contents () = - read_ld_conf_contents Config.standard_library @ - begin match Config.ocaml_library with - | None -> [] - | Some dir -> read_ld_conf_contents dir - end + read_ld_conf_contents Config.standard_library (* Split the CAML_LD_LIBRARY_PATH environment variable and return the corresponding list of directories. *) diff --git a/byterun/Makefile.common b/byterun/Makefile.common index 567834727d..a84bd399d5 100755 --- a/byterun/Makefile.common +++ b/byterun/Makefile.common @@ -47,6 +47,7 @@ all-runtimed: ocamlrund$(EXE) libcamlrund.$(A) ld.conf: ../config/Makefile echo "$(STUBLIBDIR)" > ld.conf echo "$(LIBDIR)" >> ld.conf + -test -f $(OCAMLLIB)/ld.conf && cat $(OCAMLLIB)/ld.conf >> ld.conf install:: cp ocamlrun$(EXE) $(BINDIR)/jocamlrun$(EXE) |