diff options
| author | Masami HIRATA <msmhrt@gmail.com> | 2012-07-24 23:10:48 +0900 |
|---|---|---|
| committer | Richard W.M. Jones <rjones@redhat.com> | 2012-08-05 22:48:52 +0100 |
| commit | 0fdffa8a3ec54e996c0611a65855550299efd043 (patch) | |
| tree | 741d32fcfb080e4af28fd6bae43d66a6b0fce0e8 | |
| parent | bfedfb5777c6f42c4d9d0f704a433b81453fe514 (diff) | |
Mac OS X: Use libtool --mode=execute instead of LD_LIBRARY_PATH
because Mac OS X doesn't support LD_LIBRARY_PATH
Signed-off-by: Masami HIRATA <msmhrt@gmail.com>
(cherry picked from commit 61c9ea496e0579bb7d1bcf496595d66c3f08cfec)
| -rw-r--r-- | ocaml/Makefile.am | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/ocaml/Makefile.am b/ocaml/Makefile.am index ea137cee..9439222c 100644 --- a/ocaml/Makefile.am +++ b/ocaml/Makefile.am @@ -108,7 +108,7 @@ noinst_DATA += \ bindtests.bc: bindtests.cmo mlguestfs.cma mkdir -p t - LD_LIBRARY_PATH=../src/.libs \ + $(top_builddir)/libtool -dlopen $(top_builddir)/src/.libs/libguestfs.la --mode=execute \ $(OCAMLFIND) ocamlc $(OCAMLCFLAGS) -I . -package unix -linkpkg mlguestfs.cma $< -o $@ bindtests.opt: bindtests.cmx mlguestfs.cmxa @@ -117,7 +117,7 @@ bindtests.opt: bindtests.cmx mlguestfs.cmxa t/guestfs_005_load.bc: t/guestfs_005_load.cmo mlguestfs.cma mkdir -p t - LD_LIBRARY_PATH=../src/.libs \ + $(top_builddir)/libtool -dlopen $(top_builddir)/src/.libs/libguestfs.la --mode=execute \ $(OCAMLFIND) ocamlc $(OCAMLCFLAGS) -I . -package unix -linkpkg mlguestfs.cma $< -o $@ t/guestfs_005_load.opt: t/guestfs_005_load.cmx mlguestfs.cmxa @@ -126,7 +126,7 @@ t/guestfs_005_load.opt: t/guestfs_005_load.cmx mlguestfs.cmxa t/guestfs_010_basic.bc: t/guestfs_010_basic.cmo mlguestfs.cma mkdir -p t - LD_LIBRARY_PATH=../src/.libs \ + $(top_builddir)/libtool -dlopen $(top_builddir)/src/.libs/libguestfs.la --mode=execute \ $(OCAMLFIND) ocamlc $(OCAMLCFLAGS) -I . -package unix -linkpkg mlguestfs.cma $< -o $@ t/guestfs_010_basic.opt: t/guestfs_010_basic.cmx mlguestfs.cmxa @@ -135,7 +135,7 @@ t/guestfs_010_basic.opt: t/guestfs_010_basic.cmx mlguestfs.cmxa t/guestfs_070_threads.bc: t/guestfs_070_threads.cmo mlguestfs.cma mkdir -p t - LD_LIBRARY_PATH=../src/.libs \ + $(top_builddir)/libtool -dlopen $(top_builddir)/src/.libs/libguestfs.la --mode=execute \ $(OCAMLFIND) ocamlc $(OCAMLCFLAGS) -I . -package unix,threads -thread -linkpkg mlguestfs.cma $< -o $@ t/guestfs_070_threads.opt: t/guestfs_070_threads.cmx mlguestfs.cmxa @@ -144,7 +144,7 @@ t/guestfs_070_threads.opt: t/guestfs_070_threads.cmx mlguestfs.cmxa t/guestfs_080_optargs.bc: t/guestfs_080_optargs.cmo mlguestfs.cma mkdir -p t - LD_LIBRARY_PATH=../src/.libs \ + $(top_builddir)/libtool -dlopen $(top_builddir)/src/.libs/libguestfs.la --mode=execute \ $(OCAMLFIND) ocamlc $(OCAMLCFLAGS) -I . -package unix -linkpkg mlguestfs.cma $< -o $@ t/guestfs_080_optargs.opt: t/guestfs_080_optargs.cmx mlguestfs.cmxa @@ -153,7 +153,7 @@ t/guestfs_080_optargs.opt: t/guestfs_080_optargs.cmx mlguestfs.cmxa t/guestfs_400_events.bc: t/guestfs_400_events.cmo mlguestfs.cma mkdir -p t - LD_LIBRARY_PATH=../src/.libs \ + $(top_builddir)/libtool -dlopen $(top_builddir)/src/.libs/libguestfs.la --mode=execute \ $(OCAMLFIND) ocamlc $(OCAMLCFLAGS) -I . -package unix -linkpkg mlguestfs.cma $< -o $@ t/guestfs_400_events.opt: t/guestfs_400_events.cmx mlguestfs.cmxa @@ -162,7 +162,7 @@ t/guestfs_400_events.opt: t/guestfs_400_events.cmx mlguestfs.cmxa t/guestfs_400_progress.bc: t/guestfs_400_progress.cmo mlguestfs.cma mkdir -p t - LD_LIBRARY_PATH=../src/.libs \ + $(top_builddir)/libtool -dlopen $(top_builddir)/src/.libs/libguestfs.la --mode=execute \ $(OCAMLFIND) ocamlc $(OCAMLCFLAGS) -I . -package unix -linkpkg mlguestfs.cma $< -o $@ t/guestfs_400_progress.opt: t/guestfs_400_progress.cmx mlguestfs.cmxa |