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

PR#5330: thread tag with '.top' and '.inferred.mli' targets 

git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@11169 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
master
Xavier Clerc 2011-08-08 09:39:10 +00:00
parent d9eb848d86
commit 5aa55e0fc8
3 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Changes
View File

@ -30,6 +30,7 @@ Standard library:
Bug Fixes:
- PR#5322: type abbreviations expanding to a universal type variable
- PR#5330: thread tag with '.top' and '.inferred.mli' targets
OCaml 3.12.1:
----------------------

4
ocamlbuild/ocaml_specific.ml
View File

@ -527,7 +527,9 @@ flag ["ocaml"; "compile"; "thread"] (A "-thread");;
if not !Options.use_ocamlfind then begin
flag ["ocaml"; "doc"; "thread"] (S[A"-I"; A"+threads"]);
flag ["ocaml"; "link"; "thread"; "native"; "program"] (S[A "threads.cmxa"; A "-thread"]);
flag ["ocaml"; "link"; "thread"; "byte"; "program"] (S[A "threads.cma"; A "-thread"])
flag ["ocaml"; "link"; "thread"; "byte"; "program"] (S[A "threads.cma"; A "-thread"]);
flag ["ocaml"; "link"; "thread"; "native"; "toplevel"] (S[A "threads.cmxa"; A "-thread"]);
flag ["ocaml"; "link"; "thread"; "byte"; "toplevel"] (S[A "threads.cma"; A "-thread"])
end else begin
flag ["ocaml"; "link"; "thread"; "program"] (A "-thread")
end;;

1
ocamlbuild/ocaml_tools.ml
View File

@ -93,6 +93,7 @@ let infer_interface ml mli env build =
let tags = tags_of_pathname ml++"ocaml" in
Ocaml_compiler.prepare_compile build ml;
Cmd(S[!Options.ocamlc; ocaml_ppflags tags; ocaml_include_flags ml; A"-i";
(if Tags.mem "thread" tags then A"-thread" else N);
T(tags++"infer_interface"); P ml; Sh">"; Px mli])
let menhir mly env build =