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

specify path to the 'find' utility for ocamlbuildlight 

git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@10434 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
master
Damien Doligez 2010-05-19 12:53:40 +00:00
parent ca5f1daae7
commit d06b348db0
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.nt
View File

@ -612,7 +612,7 @@ ocamlbuildlib.native: ocamlopt otherlibrariesopt ocamlbuild-mixed-boot
.PHONY: ocamlbuild-mixed-boot
ocamlbuild-mixed-boot:
./build/mixed-boot.sh
OCAMLBUILD_FIND=/usr/bin/find ./build/mixed-boot.sh
partialclean::
rm -rf _build

3
ocamlbuild/slurp.ml
View File

@ -129,8 +129,9 @@ let rec add root path entries =
else f :: add root path entries'
let slurp_with_find path =
let find_cmd = try Sys.getenv "OCAMLBUILD_FIND" with _ -> "find" in
let lines =
My_unix.run_and_open (Printf.sprintf "find %s" (Filename.quote path)) begin fun ic ->
My_unix.run_and_open (Printf.sprintf "%s %s" find_cmd (Filename.quote path)) begin fun ic ->
let acc = ref [] in
try while true do acc := input_line ic :: !acc done; []
with End_of_file -> !acc