diff options
| author | Hugo Herbelin | 2015-10-25 15:24:43 +0100 |
|---|---|---|
| committer | Hugo Herbelin | 2015-10-26 20:05:41 +0100 |
| commit | 7bf9bbe2968802b48230d35d34c585201ee9e9b4 (patch) | |
| tree | 34b1a526c4732cbb9d6194dd9b56b33ea584518f | |
| parent | 032f1a4ba8b5655b4f2396671061613aa8e2cf48 (diff) | |
Seeing configure as a static resolution of path, hence hardwiring long
paths for ocaml* executables in the generated config/Makefile.
Hoping I'm not doing something wrong. E.g., I don't see why it would
not be ok for windows or macosx too, since e.g. camlp5o was already
with a full path.
| -rw-r--r-- | configure.ml | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/configure.ml b/configure.ml index 1945167168..37c45f3e62 100644 --- a/configure.ml +++ b/configure.ml @@ -476,7 +476,10 @@ let camlbin, caml_version, camllib = rebase_camlexec dir camlexec; Filename.dirname camlexec.byte, camlexec.byte | None -> - try let camlc = which camlexec.byte in Filename.dirname camlc, camlc + try let camlc = which camlexec.byte in + let dir = Filename.dirname camlc in + rebase_camlexec dir camlexec; + dir, camlc with Not_found -> die (sprintf "Error: cannot find '%s' in your path!\n" camlexec.byte ^ "Please adjust your path or use the -camldir option of ./configure") |
