matthieu
/
dune
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Quote programs in the bootstrap script 

Fixes https://github.com/janestreet/jbuilder/issues/322
This commit is contained in:
Christophe Troestler 2017-11-09 17:10:03 +01:00 committed by David Allsopp
parent 9e1aeba5aa
commit 619d64d101
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
bootstrap.ml
View File

@ -130,7 +130,7 @@ let ocamldep = get_prog bin_dir "ocamldep"
let run_ocamllex src =
let dst = String.sub src ~pos:0 ~len:(String.length src - 1) in
let x = Sys.file_exists dst in
let n = exec "%s -q %s" ocamllex src in
let n = exec "%s -q %s" (Filename.quote ocamllex) src in
if n <> 0 then exit n;
if not x then
at_exit (fun () -> try Sys.remove dst with _ -> ());
@ -225,9 +225,7 @@ let read_deps files =
at_exit (fun () -> Sys.remove out_fn);
let n =
exec "%s -modules %s > %s"
ocamldep
(String.concat ~sep:" " files)
out_fn
(Filename.quote ocamldep) (String.concat ~sep:" " files) out_fn
in
if n <> 0 then exit n;
List.map (read_lines out_fn) ~f:(fun line ->
@ -350,9 +348,9 @@ let () =
| Byte -> "cma"
in
let n =
match exec "%s -w -40 -o boot.exe unix.%s %s" compiler lib_ext generated_file with
| n -> n
| exception e -> cleanup ~keep_ml_file:true; raise e
try exec "%s -w -40 -o boot.exe unix.%s %s"
(Filename.quote compiler) lib_ext generated_file
with e -> cleanup ~keep_ml_file:true; raise e
in
cleanup ~keep_ml_file:(n <> 0);
if n <> 0 then exit n