diff options
| author | Ian Campbell <ian.campbell@citrix.com> | 2011-03-31 19:07:06 +0100 |
|---|---|---|
| committer | Ian Campbell <ian.campbell@citrix.com> | 2011-03-31 19:07:06 +0100 |
| commit | bce637c6e406b9b396bbbe9be080e724cd428a2e (patch) | |
| tree | 836a52df53b0f635db85f76ed9604bf8f48c692b /tools/ocaml | |
| parent | 3c428f3e270f23acd263a551aa2519e6d3bdafb9 (diff) | |
| download | xen-bce637c6e406b9b396bbbe9be080e724cd428a2e.tar.gz xen-bce637c6e406b9b396bbbe9be080e724cd428a2e.tar.bz2 xen-bce637c6e406b9b396bbbe9be080e724cd428a2e.zip | |
tools: ocaml: do not try to link dynamic objects into .a libraries
lib<foo>_stubs.a was linking against $(LIBS_<foo>) which only includes
dynamic linkage information which is not useful for a static library.
$(LIBS_<foo>) is still used when linking <foo>.cmxa
Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
Committed-by: Ian Jackson <ian.jackson@eu.citrix.com>
Diffstat (limited to 'tools/ocaml')
| -rw-r--r-- | tools/ocaml/Makefile.rules | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/ocaml/Makefile.rules b/tools/ocaml/Makefile.rules index c630764569..b669764fe6 100644 --- a/tools/ocaml/Makefile.rules +++ b/tools/ocaml/Makefile.rules @@ -54,7 +54,7 @@ mk-caml-lib-bytecode = $(call quiet-command, $(OCAMLC) $(OCAMLCFLAGS) -a -o $1 $ mk-caml-stubs = $(call quiet-command, $(OCAMLMKLIB) -o `basename $1 .a` $2,MKLIB,$1) mk-caml-lib-stubs = \ - $(call quiet-command, $(AR) rcs $1 $2 && $(OCAMLMKLIB) -o `basename $1 .a | sed -e 's/^lib//'` $3 $2,MKLIB,$1) + $(call quiet-command, $(AR) rcs $1 $2 && $(OCAMLMKLIB) -o `basename $1 .a | sed -e 's/^lib//'` $2,MKLIB,$1) # define a library target <name>.cmxa and <name>.cma define OCAML_LIBRARY_template @@ -65,7 +65,7 @@ define OCAML_LIBRARY_template $(1)_stubs.a: $(foreach obj,$$($(1)_C_OBJS),$(obj).o) $(call mk-caml-stubs,$$@, $$+) lib$(1)_stubs.a: $(foreach obj,$($(1)_C_OBJS),$(obj).o) - $(call mk-caml-lib-stubs,$$@, $$+, $(LIBS_$(1))) + $(call mk-caml-lib-stubs,$$@, $$+) endef define OCAML_NOC_LIBRARY_template |