Ekdohibs
/
ocaml
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

PR#6349: ocamlbuild.cm{o,x} must not be included in ocamlbuild.cm{a,xa} 

The bug, reported by Jacques-Pascal Deplaix, was only in trunk -- it
appeared in the bootstrap->Makefile transition.

git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@14471 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
master
Gabriel Scherer 2014-03-20 13:31:44 +00:00
parent 7578b585a1
commit ce6e8eeb1c
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ocamlbuild/Makefile
View File

@ -105,17 +105,17 @@ ocamlbuild.native: ocamlbuild_pack.cmx $(EXTRA_CMX) ocamlbuild.cmx
# The libraries
ocamlbuildlib.cma: ocamlbuild_pack.cmo $(EXTRA_CMO) ocamlbuild.cmo
ocamlbuildlib.cma: ocamlbuild_pack.cmo $(EXTRA_CMO)
$(OCAMLC) -a -o ocamlbuildlib.cma \
ocamlbuild_pack.cmo $(EXTRA_CMO) ocamlbuild.cmo
ocamlbuild_pack.cmo $(EXTRA_CMO)
ocamlbuildlightlib.cma: ocamlbuild_pack.cmo ocamlbuildlight.cmo
$(OCAMLC) -a -o ocamlbuildlightlib.cma \
ocamlbuild_pack.cmo ocamlbuildlight.cmo
ocamlbuildlib.cmxa: ocamlbuild_pack.cmx $(EXTRA_CMX) ocamlbuild.cmx
ocamlbuildlib.cmxa: ocamlbuild_pack.cmx $(EXTRA_CMX)
$(OCAMLOPT) -a -o ocamlbuildlib.cmxa \
ocamlbuild_pack.cmx $(EXTRA_CMX) ocamlbuild.cmx
ocamlbuild_pack.cmx $(EXTRA_CMX)
# The packs