diff options
| author | Guillaume Melquiond | 2016-01-06 14:22:34 +0100 |
|---|---|---|
| committer | Guillaume Melquiond | 2016-01-06 14:22:34 +0100 |
| commit | 1afa595012bbaf5fb89398b355f16159e1af399b (patch) | |
| tree | 255cc594c736debd1cbd53b92906e1fa10d80de5 /tools | |
| parent | 7ca0319268c2c6912e08c53deb742d5f7631e210 (diff) | |
| parent | 8b5d02d8706f99015c2ce8efcad32b7af228dd53 (diff) | |
Merge remote-tracking branch 'origin/v8.5' into trunk
Conflicts:
lib/cSig.mli
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/coqmktop.ml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/coqmktop.ml b/tools/coqmktop.ml index a6254b2a44..d2780e763a 100644 --- a/tools/coqmktop.ml +++ b/tools/coqmktop.ml @@ -279,7 +279,7 @@ let main () = (* - We add topstart.cmo explicitly because we shunted ocamlmktop wrapper. - With the coq .cma, we MUST use the -linkall option. *) let args = - "-linkall" :: "-rectypes" :: flags @ copts @ options @ + "-linkall" :: "-rectypes" :: "-w" :: "-31" :: flags @ copts @ options @ (std_includes basedir) @ tolink @ [ main_file ] @ topstart in if !echo then begin |