diff options
Diffstat (limited to 'dev/build')
| -rwxr-xr-x | dev/build/windows/makecoq_mingw.sh | 2 | ||||
| -rw-r--r-- | dev/build/windows/patches_coq/ocaml-4.08.1.patch | 25 |
2 files changed, 26 insertions, 1 deletions
diff --git a/dev/build/windows/makecoq_mingw.sh b/dev/build/windows/makecoq_mingw.sh index cde1d798a0..fcc585117b 100755 --- a/dev/build/windows/makecoq_mingw.sh +++ b/dev/build/windows/makecoq_mingw.sh @@ -1026,7 +1026,7 @@ function make_num { function make_zarith { make_ocaml - if build_prep https://github.com/ocaml/Zarith/archive release-1.9.1 tar.gz 1 zarith-1.9.1; then + if build_prep https://github.com/ocaml/Zarith/archive release-1.10 tar.gz 1 zarith-1.10; then logn configure ./configure log1 make log2 make install diff --git a/dev/build/windows/patches_coq/ocaml-4.08.1.patch b/dev/build/windows/patches_coq/ocaml-4.08.1.patch new file mode 100644 index 0000000000..a79033a061 --- /dev/null +++ b/dev/build/windows/patches_coq/ocaml-4.08.1.patch @@ -0,0 +1,25 @@ +diff --git a/runtime/caml/misc.h b/runtime/caml/misc.h +index 6aa98516b..8184c2797 100644 +--- a/runtime/caml/misc.h ++++ b/runtime/caml/misc.h +@@ -327,7 +327,6 @@ extern void caml_set_fields (intnat v, uintnat, uintnat); + + #if defined(_WIN32) && !defined(_UCRT) + extern int caml_snprintf(char * buf, size_t size, const char * format, ...); +-#define snprintf caml_snprintf + #endif + + #ifdef CAML_INSTR +@@ -336,6 +335,12 @@ extern int caml_snprintf(char * buf, size_t size, const char * format, ...); + #include <time.h> + #include <stdio.h> + ++/* snprintf emulation for Win32 - do define after stdio.h, in case snprintf is defined */ ++ ++#if defined(_WIN32) && !defined(_UCRT) ++#define snprintf caml_snprintf ++#endif ++ + extern intnat caml_stat_minor_collections; + extern intnat caml_instr_starttime, caml_instr_stoptime; + |