diff options
| author | Emilio Jesus Gallego Arias | 2017-09-08 23:13:53 +0200 |
|---|---|---|
| committer | Enrico Tassi | 2017-09-19 14:31:09 +0200 |
| commit | 0cc07dd290eb85bbb167dae2985cd1e468df882c (patch) | |
| tree | 11dce67458a4fc042fc7c5f7ac49c1fa4feddf9e /tools/coqmktop.ml | |
| parent | b1fbec7e3945fe2965f4ba9f80c8c31b821dbce1 (diff) | |
coq_makefile: make sure compile flags for Coq and coq_makefile are in sync
E.g. -safe-string is set by configure.ml and made available to
both make (via config/Makefile) and coq_makefile (via
config/coq_config.ml -> lib/envars.ml -> CoqMakefile.in).
Diffstat (limited to 'tools/coqmktop.ml')
| -rw-r--r-- | tools/coqmktop.ml | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/tools/coqmktop.ml b/tools/coqmktop.ml index 28a3c791cb..524fe63232 100644 --- a/tools/coqmktop.ml +++ b/tools/coqmktop.ml @@ -271,8 +271,10 @@ let main () = try (* - We add topstart.cmo explicitly because we shunted ocamlmktop wrapper. - With the coq .cma, we MUST use the -linkall option. *) + let coq_camlflags = + List.filter ((<>) "") (String.split_on_char ' ' Coq_config.caml_flags) in let args = - "-linkall" :: "-rectypes" :: "-w" :: "-31" :: flags @ copts @ options @ + coq_camlflags @ "-linkall" :: "-w" :: "-31" :: flags @ copts @ options @ (std_includes basedir) @ tolink @ [ main_file ] @ topstart in if !echo then begin |