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

PR#5652: Try to use camlp4.opt if it's possible 

git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@12902 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
master
Wojciech Meyer 2012-09-02 01:31:06 +00:00
parent 4f968563b6
commit 28701c9cfe
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ocamlbuild/ocaml_specific.ml
View File

@ -478,20 +478,26 @@ let () =
pflag ["ocaml";"compile";] "warn"
(fun param -> S [A "-w"; A param])
let try_opt name =
let cmd = Command.string_of_command_spec (A name)in
try ignore(Command.search_in_path cmd); name ^ ".opt"
with Not_found -> name
let camlp4_flags camlp4s =
List.iter begin fun camlp4 ->
flag ["ocaml"; "pp"; camlp4] (A camlp4)
flag ["ocaml"; "pp"; camlp4] (A (try_opt camlp4))
end camlp4s;;
camlp4_flags ["camlp4o"; "camlp4r"; "camlp4of"; "camlp4rf"; "camlp4orf"; "camlp4oof"];;
let camlp4_flags' camlp4s =
List.iter begin fun (camlp4, flags) ->
List.iter begin fun (camlp4, cmd, flags) ->
let flags = S (A (try_opt cmd) :: flags) in
flag ["ocaml"; "pp"; camlp4] flags
end camlp4s;;
camlp4_flags' ["camlp4orr", S[A"camlp4of"; A"-parser"; A"reloaded"];
"camlp4rrr", S[A"camlp4rf"; A"-parser"; A"reloaded"]];;
camlp4_flags' ["camlp4orr", "camlp4of", [A"-parser"; A"reloaded"];
"camlp4rrr", "camlp4rf", [A"-parser"; A"reloaded"]];;
flag ["ocaml"; "pp"; "camlp4:no_quot"] (A"-no_quot");;