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

Look for architecture size in the output of `ocamlc -config` first.

This commit is contained in:
Xavier Clerc 2017-11-03 13:44:41 +00:00
parent 72a3cb008f
commit 9b04e7e931
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/context.ml
View File

@ -307,6 +307,11 @@ let create ~(kind : Kind.t) ~path ~base_env ~env_extra ~name ~merlin ~use_findli
let _, ocamlopt_cflags = split_prog (get "native_c_compiler") in let _, ocamlopt_cflags = split_prog (get "native_c_compiler") in
(c_compiler, ocamlc_cflags, ocamlopt_cflags) (c_compiler, ocamlc_cflags, ocamlopt_cflags)
in in
let arch_sixtyfour =
match get_opt "word_size" with
| Some ws -> String.equal ws "64"
| None -> get_arch_sixtyfour stdlib_dir
in
return return
{ name { name
; kind ; kind
@ -326,7 +331,7 @@ let create ~(kind : Kind.t) ~path ~base_env ~env_extra ~name ~merlin ~use_findli
; env ; env
; env_extra ; env_extra
; findlib = Findlib.create ~stdlib_dir ~path:findlib_path ; findlib = Findlib.create ~stdlib_dir ~path:findlib_path
; arch_sixtyfour = get_arch_sixtyfour stdlib_dir ; arch_sixtyfour
; opam_var_cache ; opam_var_cache