PR#5503: error when ocamlbuild is passed an absolute path as build directory

git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@12154 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02

Changes

@@ -70,6 +70,7 @@ Bug Fixes:
 - PR5461: Double linking of bytecode modules
 - PR#5498: Unification with an empty object only checks the absence of
            the first method
+- PR#5503: error when ocamlbuild is passed an absolute path as build directory
 
 Feature wishes:
 - PR#352: new option "-stdin" to make ocaml read stdin as a script

ocamlbuild/digest_cache.ml

@@ -20,7 +20,7 @@ let get = Hashtbl.find digests
 
 let put = Hashtbl.replace digests
 
-let _digests = lazy (Pathname.pwd / !Options.build_dir / (Pathname.mk "_digests"))
+let _digests = lazy (!Options.build_dir / (Pathname.mk "_digests"))
 
 let finalize () =
   with_output_file !*_digests begin fun oc ->

ocamlbuild/ocaml_utils.ml

@@ -30,7 +30,7 @@ let flag_and_dep tags cmd_spec =
 
 let stdlib_dir = lazy begin
   (* FIXME *)
-  let ocamlc_where = sprintf "%s/ocamlc.where" (Pathname.pwd / !Options.build_dir) in
+  let ocamlc_where = sprintf "%s/ocamlc.where" !Options.build_dir in
   let () = Command.execute ~quiet:true (Cmd(S[!Options.ocamlc; A"-where"; Sh">"; P ocamlc_where])) in
   String.chomp (read_file ocamlc_where)
 end