Merge pull request #10451 from dra27/no-scripting-for-4.13

Fix lack of iconv on Cygwin and build performance regression on Windows

(cherry picked from commit 3a0b1b1e15bc2f33bc471255826d3672b5b27aa9)

1 files changed, 11 insertions, 5 deletions

diff --git a/Changes b/Changes
index 588749256f..e8de2579d8 100644
--- a/Changes
+++ b/Changes
@@ -192,11 +192,11 @@ OCaml 4.13.0
   (Gabriel Scherer, review by Nicolás Ojeda Bär, Alain Frisch, Xavier Leroy,
    Daniel Bünzli and Stephen Dolan)
 
-* #10169, #10270, #10301: Use capitalized module names in the Standard Library
-  prefixing scheme to match Dune, e.g. Stdlib__String instead of Stdlib__string.
-  This is a breaking change only to code which attempted to use the internal
-  names before. The Standard Library generated by the Dune rules is now
-  equivalent to the main build (the Dune rules still do not generate a
+* #10169, #10270, #10301, #10451: Use capitalized module names in the Standard
+  Library prefixing scheme to match Dune, e.g. Stdlib__String instead of
+  Stdlib__string. This is a breaking change only to code which attempted to use
+  the internal names before. The Standard Library generated by the Dune rules is
+  now equivalent to the main build (the Dune rules still do not generate a
   distributable compiler).
   (David Allsopp and Mark Shinwell, review by Gabriel Scherer)
 
@@ -470,6 +470,12 @@ OCaml 4.13.0
   which runtime to use while building the compilers (Sébastien Hinderer,
   review by David Allsopp)
 
+- #10451: Replace the use of iconv with a C utility to convert $(LIBDIR) to a
+  C string constant on Windows when building the runtime. Hardens the generation
+  of the constant on Unix for paths with backslashes, double-quotes and
+  newlines.
+  (David Allsopp, review by Florian Angeletti and Sébastien Hinderer)
+
 ### Bug fixes:
 
 - #6654, #9774, #10401: make `include` and with `constraints` handle correctly