diff options
| author | Richard W.M. Jones <rjones@redhat.com> | 2012-01-28 17:35:34 +0000 |
|---|---|---|
| committer | Richard W.M. Jones <rjones@redhat.com> | 2012-01-28 17:35:52 +0000 |
| commit | 03684e7a616eab56a81665c8c8859426e50ae429 (patch) | |
| tree | 779ca0767f01cfae2a6be68668439a1e0e2864f2 | |
| parent | a3ac2cc788c9c08b13a03799e8d62ebd52be8a57 (diff) | |
| download | libguestfs-03684e7a616eab56a81665c8c8859426e50ae429.tar.gz libguestfs-03684e7a616eab56a81665c8c8859426e50ae429.tar.xz libguestfs-03684e7a616eab56a81665c8c8859426e50ae429.zip | |
ocaml: Various fixes for bytecode compilation.
Set LD_LIBRARY_PATH so we link against the just-built library, not
the installed library.
Use OCAMLCFLAGS instead of OCAMLOPTFLAGS where appropriate.
Remove unnecessary -cclib option for bytecode linking (gcc is not used
in this case).
This fixes commit eb68a314133c88260cdf4547d7d338446488e698.
| -rw-r--r-- | ocaml/Makefile.am | 23 |
1 files changed, 15 insertions, 8 deletions
diff --git a/ocaml/Makefile.am b/ocaml/Makefile.am index 50f26496..c512d0ba 100644 --- a/ocaml/Makefile.am +++ b/ocaml/Makefile.am @@ -102,7 +102,8 @@ noinst_DATA += \ bindtests.bc: bindtests.cmo mlguestfs.cma mkdir -p t - $(OCAMLFIND) ocamlc $(OCAMLCFLAGS) -cclib -L$(top_builddir)/src/.libs -I . -package unix -linkpkg mlguestfs.cma $< -o $@ + LD_LIBRARY_PATH=../src/.libs \ + $(OCAMLFIND) ocamlc $(OCAMLCFLAGS) -I . -package unix -linkpkg mlguestfs.cma $< -o $@ bindtests.opt: bindtests.cmx mlguestfs.cmxa mkdir -p t @@ -110,7 +111,8 @@ bindtests.opt: bindtests.cmx mlguestfs.cmxa t/guestfs_005_load.bc: t/guestfs_005_load.cmo mlguestfs.cma mkdir -p t - $(OCAMLFIND) ocamlc $(OCAMLOPTFLAGS) -cclib -L$(top_builddir)/src/.libs -I . -package unix -linkpkg mlguestfs.cma $< -o $@ + LD_LIBRARY_PATH=../src/.libs \ + $(OCAMLFIND) ocamlc $(OCAMLCFLAGS) -I . -package unix -linkpkg mlguestfs.cma $< -o $@ t/guestfs_005_load.opt: t/guestfs_005_load.cmx mlguestfs.cmxa mkdir -p t @@ -118,7 +120,8 @@ 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 - $(OCAMLFIND) ocamlc $(OCAMLOPTFLAGS) -cclib -L$(top_builddir)/src/.libs -I . -package unix -linkpkg mlguestfs.cma $< -o $@ + LD_LIBRARY_PATH=../src/.libs \ + $(OCAMLFIND) ocamlc $(OCAMLCFLAGS) -I . -package unix -linkpkg mlguestfs.cma $< -o $@ t/guestfs_010_basic.opt: t/guestfs_010_basic.cmx mlguestfs.cmxa mkdir -p t @@ -126,7 +129,8 @@ 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 - $(OCAMLFIND) ocamlc $(OCAMLOPTFLAGS) -cclib -L$(top_builddir)/src/.libs -I . -package unix,threads -thread -linkpkg mlguestfs.cma $< -o $@ + LD_LIBRARY_PATH=../src/.libs \ + $(OCAMLFIND) ocamlc $(OCAMLCFLAGS) -I . -package unix,threads -thread -linkpkg mlguestfs.cma $< -o $@ t/guestfs_070_threads.opt: t/guestfs_070_threads.cmx mlguestfs.cmxa mkdir -p t @@ -134,7 +138,8 @@ 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 - $(OCAMLFIND) ocamlc $(OCAMLOPTFLAGS) -cclib -L$(top_builddir)/src/.libs -I . -package unix -linkpkg mlguestfs.cma $< -o $@ + LD_LIBRARY_PATH=../src/.libs \ + $(OCAMLFIND) ocamlc $(OCAMLCFLAGS) -I . -package unix -linkpkg mlguestfs.cma $< -o $@ t/guestfs_080_optargs.opt: t/guestfs_080_optargs.cmx mlguestfs.cmxa mkdir -p t @@ -142,7 +147,8 @@ 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 - $(OCAMLFIND) ocamlc $(OCAMLOPTFLAGS) -cclib -L$(top_builddir)/src/.libs -I . -package unix -linkpkg mlguestfs.cma $< -o $@ + LD_LIBRARY_PATH=../src/.libs \ + $(OCAMLFIND) ocamlc $(OCAMLCFLAGS) -I . -package unix -linkpkg mlguestfs.cma $< -o $@ t/guestfs_400_events.opt: t/guestfs_400_events.cmx mlguestfs.cmxa mkdir -p t @@ -150,7 +156,8 @@ 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 - $(OCAMLFIND) ocamlc $(OCAMLOPTFLAGS) -cclib -L$(top_builddir)/src/.libs -I . -package unix -linkpkg mlguestfs.cma $< -o $@ + LD_LIBRARY_PATH=../src/.libs \ + $(OCAMLFIND) ocamlc $(OCAMLCFLAGS) -I . -package unix -linkpkg mlguestfs.cma $< -o $@ t/guestfs_400_progress.opt: t/guestfs_400_progress.cmx mlguestfs.cmxa mkdir -p t @@ -159,7 +166,7 @@ t/guestfs_400_progress.opt: t/guestfs_400_progress.cmx mlguestfs.cmxa # Need to rebuild the tests from source if the main library has # changed at all, otherwise we get inconsistent assumptions. t/guestfs_070_threads.cmo: t/guestfs_070_threads.ml mlguestfs.cma - $(OCAMLFIND) ocamlc $(OCAMLOPTFLAGS) -package unix,threads -thread -linkpkg -c $< -o $@ + $(OCAMLFIND) ocamlc $(OCAMLCFLAGS) -package unix,threads -thread -linkpkg -c $< -o $@ t/guestfs_070_threads.cmx: t/guestfs_070_threads.ml mlguestfs.cmxa $(OCAMLFIND) ocamlopt $(OCAMLOPTFLAGS) -package unix,threads -thread -linkpkg -c $< -o $@ |