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

fix,build,partial,native: Unix lib is not an ocamlbuild dependency in partial mode (fix make world.opt). 

git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@8699 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
master
Nicolas Pouillard 2007-11-30 12:49:44 +00:00
parent 67345926f7
commit ac3491b233
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
myocamlbuild.ml
View File

@ -767,12 +767,15 @@ let mk_camlp4_bin name ?unix:(link_unix=true) modules =
let name = "camlp4"/name in
let byte = name-.-"byte" in
let native = name-.-"native" in
let unix_cma, dep_unix_byte, unix_cmxa, dep_unix_native, include_unix =
let unix_cma, unix_cmxa, include_unix =
if link_unix
then A"unix.cma", [unix_dir/"unix.cma"],
A"unix.cmxa", [unix_dir/"unix.cmxa"; unix_dir/"unix"-.-C.a],
S[A"-I"; P unix_dir]
else N,[],N,[],N in
then A"unix.cma", A"unix.cmxa", S[A"-I"; P unix_dir]
else N,N,N in
let dep_unix_byte, dep_unix_native =
if link_unix && not partial
then [unix_dir/"unix.cma"],
[unix_dir/"unix.cmxa"; unix_dir/"unix"-.-C.a]
else [],[] in
let deps = special_modules @ modules @ [camlp4_bin] in
let cmos = add_extensions ["cmo"] deps in
let cmxs = add_extensions ["cmx"] deps in